git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
961d7d0
7cb36b6
)
Merge branch 'linus' into core/iommu
author
Ingo Molnar
<mingo@elte.hu>
Fri, 16 Jan 2009 09:09:10 +0000
(10:09 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 16 Jan 2009 09:09:10 +0000
(10:09 +0100)
Conflicts:
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/machvec.h
arch/ia64/include/asm/machvec_sn2.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff