git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
25cf84c
3e58974
)
Merge branch 'for-next' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Mon, 8 Mar 2010 15:55:37 +0000
(16:55 +0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Mon, 8 Mar 2010 15:55:37 +0000
(16:55 +0100)
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff