Commits
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
Showing diff to3dd392a407d
Ingo Molnar committed 3dd392a407dMMerge branch 'linus' into x86/pat2 Conflicts: arch/x86/mm/init_64.c
Linus Torvalds committed 72d31053f62Linux 2.6.27-rc7
Joerg Roedel committed 129d6aba444x86, AMD IOMMU: initialize dma_ops after sysfs registration If sysfs registration fail...
Thomas Gleixner committed 1e19b16a30cAMD IOMMU: use iommu_device_max_index, fix include/linux/iommu-helper.h has no header ...