arch/x86/kernel/amd_iommu_init.c · 3f6280ddf25fa656d0e17960588e52bee48a7547 · nexedi / linux

Merge branches 'amd-iommu/fixes', 'amd-iommu/debug',... · 83cce2b6

Joerg Roedel authored May 28, 2009

Merge branches 'amd-iommu/fixes', 'amd-iommu/debug', 'amd-iommu/suspend-resume' and 'amd-iommu/extended-allocator' into amd-iommu/2.6.31

Conflicts:
	arch/x86/kernel/amd_iommu.c
	arch/x86/kernel/amd_iommu_init.c

83cce2b6

amd_iommu_init.c 33.6 KB

Replace amd_iommu_init.c