diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-08-30 16:12:10 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-08-30 16:12:10 +0200 |
| commit | 4c008893415385a0941bbb626c666620a4d7ab00 (patch) | |
| tree | 979d6ef8540d1c16369679f354c06580eaadb639 /MAINTAINERS | |
| parent | 1ee9feb2c9f893b893c900d2492c6a01dca680f3 (diff) | |
| parent | dbe8e6a81a2a45dfa210c2c271472db80efaa03f (diff) | |
| download | linux-4c008893415385a0941bbb626c666620a4d7ab00.tar.gz linux-4c008893415385a0941bbb626c666620a4d7ab00.tar.bz2 linux-4c008893415385a0941bbb626c666620a4d7ab00.zip | |
Merge branch 'arm/smmu' into arm/mediatek
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9cbcf167bdd0..74e9d9c2013e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1350,8 +1350,7 @@ M: Will Deacon <will@kernel.org> 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/arm-smmu* F: drivers/iommu/io-pgtable-arm.c F: drivers/iommu/io-pgtable-arm-v7s.c |