git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3dd392a
72d3105
129d6ab
1e19b16
)
Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus...
author
Ingo Molnar
<mingo@elte.hu>
Fri, 10 Oct 2008 17:47:12 +0000
(19:47 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 10 Oct 2008 17:47:12 +0000
(19:47 +0200)
Conflicts:
arch/x86/kernel/pci-gart_64.c
include/asm-x86/dma-mapping.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff