git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a318631
024e8ac
)
Merge branch 'linus' into x86/header-guards
author
Ingo Molnar
<mingo@elte.hu>
Sat, 26 Jul 2008 13:30:40 +0000
(15:30 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Sat, 26 Jul 2008 13:30:40 +0000
(15:30 +0200)
Conflicts:
include/asm-x86/gpio.h
include/asm-x86/ide.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff