summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/omap-iommu.c
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2014-07-31 20:29:02 +0200
committerJoerg Roedel <jroedel@suse.de>2014-07-31 20:29:02 +0200
commit4c5e9d9f0ddf5d4ba9c51eee2ef1a4d6e93ccf56 (patch)
treeffa537cd1bd5282acc8e81458df84577eb8a45d1 /drivers/iommu/omap-iommu.c
parentiommu/vt-d: Fix race setting IRQ CPU affinity while freeing IRQ (diff)
parentiommu/amd: Fix 2 typos in comments (diff)
parentiommu/omap: Remove platform data da_start and da_end fields (diff)
parentiommu/fsl: Add void declarations in zero-arg functions. (diff)
parentMerge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/lin... (diff)
parentiommu/exynos: Select ARM_DMA_USE_IOMMU (diff)
parentdevicetree: Add generic IOMMU device tree bindings (diff)
downloadlinux-4c5e9d9f0ddf5d4ba9c51eee2ef1a4d6e93ccf56.tar.xz
linux-4c5e9d9f0ddf5d4ba9c51eee2ef1a4d6e93ccf56.zip
Merge branches 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu', 'arm/smmu', 'arm/exynos' and 'core' into next