diff options
author | Joerg Roedel <jroedel@suse.de> | 2016-05-09 19:39:17 +0200 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2016-05-09 19:39:17 +0200 |
commit | 6c0b43df74f900e7f31a49d1844f166df0f8afc6 (patch) | |
tree | e91591771184559e78a57a4d4dd9178c547e2d20 /drivers/of | |
parent | iommu/io-pgtable-arm-v7s: Support IOMMU_MMIO flag (diff) | |
parent | iommu/rockchip: Don't feed NULL res pointers to devres (diff) | |
parent | iommu/omap: Align code with open parenthesis (diff) | |
parent | x86/vt-d: Fix comment for dma_pte_free_pagetable() (diff) | |
parent | powerpc: Fix incorrect PPC32 PAMU dependency (diff) | |
parent | iommu/arm-smmu: Use per-domain page sizes. (diff) | |
parent | iommu/amd: Remove statistics code (diff) | |
download | linux-6c0b43df74f900e7f31a49d1844f166df0f8afc6.tar.xz linux-6c0b43df74f900e7f31a49d1844f166df0f8afc6.zip |
Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next