diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-10-02 14:40:03 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-10-02 14:40:03 +0200 |
| commit | 009487258399cb4f431992919fa0f386d1b74ceb (patch) | |
| tree | 6e6bdafb4fa93a455c409bf9087fc60661cf464d /drivers/pnp | |
| parent | dma-debug: Remove local BUS_NOTIFY_UNBOUND_DRIVER define (diff) | |
| parent | dma: tegra: move smmu.h into SMMU driver (diff) | |
| parent | iommu/exynos: use list_del_init instead of list_del/INIT_LIST_HEAD (diff) | |
| parent | iommu/amd: Fix features reporting (diff) | |
| parent | intel-iommu: Default to non-coherent for domains unattached to iommus (diff) | |
| parent | iommu/amd: Remove obsolete comment line (diff) | |
| download | linux-009487258399cb4f431992919fa0f386d1b74ceb.tar.xz linux-009487258399cb4f431992919fa0f386d1b74ceb.zip | |
Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next
Conflicts:
drivers/iommu/amd_iommu_init.c