Commits
Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next Conflicts: drivers/iommu/amd_iommu.c drivers/iommu/iommu.c
Showing diff to0ed6d2d27bc
Linus Torvalds committed 899e3ee4049Linux 3.1-rc10
Joerg Roedel committed fcd0861db1ciommu/amd: Fix wrong shift direction The shift direction was wrong because the functio...
Arnd Bergmann committed e4efd94bde1iommu/omap: always provide iommu debug code The iommu module on omap contains a few fu...
Ohad Ben-Cohen committed 0ed6d2d27bciommu/core: let drivers know if an iommu fault handler isn't installed Make report_iom...- Joerg Roedel committed 94441c3bd99iommu/core: Remove global iommu_ops and register_iommu With all IOMMU drivers being co...