git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b6d4f7e
f934fb1
)
Merge branch 'linus' into core/generic-dma-coherent
author
Ingo Molnar
<mingo@elte.hu>
Mon, 28 Jul 2008 22:07:55 +0000
(
00:07
+0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 28 Jul 2008 22:07:55 +0000
(
00:07
+0200)
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge