diff options
| author | Joerg Roedel <jroedel@suse.de> | 2016-02-25 14:23:58 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2016-02-25 14:23:58 +0100 |
| commit | 28f691544766bb5741a51189f7d7eccfe63dc23f (patch) | |
| tree | cba6b98d759e831867c82bfbd342c0482a0eaa0d /MAINTAINERS | |
| parent | Linux 4.5-rc5 (diff) | |
| parent | MAINTAINERS: update ARM SMMU entry (diff) | |
| download | linux-28f691544766bb5741a51189f7d7eccfe63dc23f.tar.xz linux-28f691544766bb5741a51189f7d7eccfe63dc23f.zip | |
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-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4978dc19a4d2..dbba65be4673 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> |