]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus...
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 17:47:12 +0000 (19:47 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Oct 2008 17:47:12 +0000 (19:47 +0200)
commit9058f2b6b711d12c0f0e919e5141bf88f46b1718
treecd2f3d763848dc550c19daf42f6146425aff058c
parente61deec9bc519b7b2dad36c3d5ec8e9605bb009b
parent0815e04c04a472e1434df395a3b53d861f8d5e3f
parent157d7e48c25aadfd774d659e3ba7ad583cc971c9
parent0bb9697d08feda29436a1dba25fafbb72175db07
Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus-phase3-B

Conflicts:
arch/x86/kernel/pci-gart_64.c
include/asm-x86/dma-mapping.h
12 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
arch/x86/Kconfig
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/pci-dma.c
arch/x86/kernel/pci-gart_64.c
include/asm-x86/amd_iommu.h
include/asm-x86/amd_iommu_types.h
include/asm-x86/bitops.h
include/asm-x86/dma-mapping.h
include/asm-x86/gart.h
include/asm-x86/iommu.h