diff options
author | Joerg Roedel <jroedel@suse.de> | 2015-01-26 13:22:25 +0100 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2015-01-26 13:22:25 +0100 |
commit | 16753322983bcca0eca6d81f20d23277df0d6cf7 (patch) | |
tree | 8064489ae62d2fc8ea344b6736f0b204e3187a3b /MAINTAINERS | |
parent | 26bc420b59a38e4e6685a73345a0def461136dce (diff) | |
parent | 859a732e4f713270152c78df6e09accbde006734 (diff) | |
download | blackbird-obmc-linux-16753322983bcca0eca6d81f20d23277df0d6cf7.tar.gz blackbird-obmc-linux-16753322983bcca0eca6d81f20d23277df0d6cf7.zip |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2ebb056cbe0a..c437f7e9e9a4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1582,6 +1582,7 @@ M: Will Deacon <will.deacon@arm.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: drivers/iommu/arm-smmu.c +F: drivers/iommu/io-pgtable-arm.c ARM64 PORT (AARCH64 ARCHITECTURE) M: Catalin Marinas <catalin.marinas@arm.com> |