git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b2d9d33
6e86841
)
Merge commit 'v2.6.27-rc1' into x86/core
author
Ingo Molnar
<mingo@elte.hu>
Wed, 30 Jul 2008 17:33:48 +0000
(19:33 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 30 Jul 2008 17:33:48 +0000
(19:33 +0200)
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge