diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-10-21 14:38:55 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-10-21 14:38:55 +0200 |
| commit | 1abb4ba596a91a839f82e0c9c837b777d574e83d (patch) | |
| tree | 6f77339f0d25d429f767833e09cdb0f60b8ff5ec /drivers/iommu/omap-iommu.c | |
| parent | Linux 3.1-rc10 (diff) | |
| parent | iommu/amd: Fix wrong shift direction (diff) | |
| parent | iommu/omap: always provide iommu debug code (diff) | |
| parent | iommu/core: let drivers know if an iommu fault handler isn't installed (diff) | |
| parent | iommu/core: Remove global iommu_ops and register_iommu (diff) | |
| download | linux-1abb4ba596a91a839f82e0c9c837b777d574e83d.tar.xz linux-1abb4ba596a91a839f82e0c9c837b777d574e83d.zip | |
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