summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2014-04-02 19:13:12 +0200
committerJoerg Roedel <joro@8bytes.org>2014-04-02 19:13:12 +0200
commite172b81222548b856ecbe59b305d2cb733d512c4 (patch)
tree67bac9445c92caed203ad4452319ed3decc7662c /drivers/iommu
parentLinux 3.14 (diff)
parentMerge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/lin... (diff)
parentiommu/amd: Fix logic to determine and checking max PASID (diff)
parentiommu/omap: Check for NULL in iopte_free() (diff)
parentiommu/shmobile: Depend on ARCH_SHMOBILE (diff)
parentiommu/vt-d: Fix error handling in ANDD processing (diff)
downloadlinux-e172b81222548b856ecbe59b305d2cb733d512c4.tar.xz
linux-e172b81222548b856ecbe59b305d2cb733d512c4.zip
Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'arm/omap', 'arm/shmobile' and 'x86/vt-d' into next