summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2016-02-25 14:23:58 +0100
committerJoerg Roedel <jroedel@suse.de>2016-02-25 14:23:58 +0100
commit28f691544766bb5741a51189f7d7eccfe63dc23f (patch)
treecba6b98d759e831867c82bfbd342c0482a0eaa0d /MAINTAINERS
parent81f70ba233d5f660e1ea5fe23260ee323af5d53a (diff)
parentc8bff3a68f33b94e53f65aa9a4c0e9be34b6b514 (diff)
downloadop-kernel-dev-28f691544766bb5741a51189f7d7eccfe63dc23f.zip
op-kernel-dev-28f691544766bb5741a51189f7d7eccfe63dc23f.tar.gz
Merge branch 'for-joerg/io-pgtable' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/io-pgtable
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4978dc1..dbba65b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1793,11 +1793,13 @@ F: drivers/edac/synopsys_edac.c
ARM SMMU DRIVERS
M: Will Deacon <will.deacon@arm.com>
+R: Robin Murphy <robin.murphy@arm.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: drivers/iommu/arm-smmu.c
F: drivers/iommu/arm-smmu-v3.c
F: drivers/iommu/io-pgtable-arm.c
+F: drivers/iommu/io-pgtable-arm-v7s.c
ARM64 PORT (AARCH64 ARCHITECTURE)
M: Catalin Marinas <catalin.marinas@arm.com>
OpenPOWER on IntegriCloud