git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fec6ed1
1503af6
)
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
author
Ingo Molnar
<mingo@elte.hu>
Mon, 6 Oct 2008 14:15:57 +0000
(16:15 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 6 Oct 2008 14:15:57 +0000
(16:15 +0200)
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/gpio.h
include/asm-x86/idle.h
include/asm-x86/kvm_host.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff