summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/arm-smmu.c
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2016-12-06 17:32:16 +0100
committerJoerg Roedel <jroedel@suse.de>2016-12-06 17:32:16 +0100
commit1465f481460cbfc60dc119873099d89a58f9be4f (patch)
tree9594a69a3f5f26209cca2bc5630b2f4f6e447ec5 /drivers/iommu/arm-smmu.c
parent3e5de27e940d00d8d504dfb96625fb654f641509 (diff)
parent00c7c81f7b49d9b739690c45d9986474d52c6240 (diff)
parent18b709beb503bfc9a96a2e4b93d3cae4f5b17df0 (diff)
parentebcfa284395474187cca3d26d2a995b1d0fcce21 (diff)
parent37bad55b784cad590e13d9d4b3ad2f9202e254e4 (diff)
parent24c790fbf5d8f54c8c82979db11edea8855b74bf (diff)
parent2f5f44f205cc958bcd881ee21e4844fae83b0364 (diff)
downloadlinux-stable-1465f481460cbfc60dc119873099d89a58f9be4f.tar.gz
linux-stable-1465f481460cbfc60dc119873099d89a58f9be4f.tar.bz2
linux-stable-1465f481460cbfc60dc119873099d89a58f9be4f.zip
Merge branches 'arm/mediatek', 'arm/smmu', 'x86/amd', 's390', 'core' and 'arm/exynos' into next