diff options
| author | Joerg Roedel <jroedel@suse.de> | 2020-07-29 14:47:37 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2020-07-29 14:47:37 +0200 |
| commit | e46b3c0d011eab9933c183d5b47569db8e377281 (patch) | |
| tree | b379369adf29a22cd2f21e7222c395091ebc7fe2 /MAINTAINERS | |
| parent | 56fbacc9bf23d372d78eef3809c1ac93d88e11f4 (diff) | |
| parent | e86d1aa8b60f7ea18d36f50296d7d20eb2852e7e (diff) | |
| download | linux-e46b3c0d011eab9933c183d5b47569db8e377281.tar.gz linux-e46b3c0d011eab9933c183d5b47569db8e377281.tar.bz2 linux-e46b3c0d011eab9933c183d5b47569db8e377281.zip | |
Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next
More Arm SMMU updates for 5.9
- Move Arm SMMU driver files into their own subdirectory
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 836e4844c530..a8b4904c6bdd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1498,7 +1498,7 @@ R: Robin Murphy <robin.murphy@arm.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/iommu/arm,smmu* -F: drivers/iommu/arm-smmu* +F: drivers/iommu/arm/ F: drivers/iommu/io-pgtable-arm-v7s.c F: drivers/iommu/io-pgtable-arm.c @@ -16827,7 +16827,7 @@ M: Thierry Reding <thierry.reding@gmail.com> R: Krishna Reddy <vdumpa@nvidia.com> L: linux-tegra@vger.kernel.org S: Supported -F: drivers/iommu/arm-smmu-nvidia.c +F: drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c F: drivers/iommu/tegra* TEGRA KBC DRIVER |