Merge branch 'x86/urgent' into x86/iommu
authorIngo Molnar <mingo@elte.hu>
Mon, 1 Dec 2008 19:36:13 +0000 (20:36 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 1 Dec 2008 19:36:13 +0000 (20:36 +0100)
commitf6d2e6f57bba66272b28dd20c949b14ce39cb804
tree2bf153af4d5b4b33ad2c1e88347c7fd752fb6332
parent8caac56305cef98f9357b060a77939d17699937d
parent7b1dedca42ac0d0d0be01e39d8461bb53a2389b3
Merge branch 'x86/urgent' into x86/iommu
arch/x86/Kconfig
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c
arch/x86/kernel/setup.c