Merge branch 'x86/iommu' into x86/core
authorIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 15:30:27 +0000 (16:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 23 Dec 2008 15:30:27 +0000 (16:30 +0100)
commit3e5621edb3392b28efb260ac99b2d26fb8b44e73
tree6d26f08661344d6f17271b287a4a89b9b85a9222
parentbe9a1d3c2e559b267983bcf8b003997b83befb49
parent181de82ee3ffda1175f89d50c991dae31b79280c
Merge branch 'x86/iommu' into x86/core
arch/x86/Kconfig
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c
arch/x86/kernel/pci-dma.c
arch/x86/kernel/setup.c