diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 09:05:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 09:05:12 -0700 |
| commit | 8e1a254099dcb7ea5eacd503799b641208300ff3 (patch) | |
| tree | 8e755dfe88d4a310e1597da7546345a4274c721d /MAINTAINERS | |
| parent | 0d45dab6c14346171b99aea34011c34f91f921fd (diff) | |
| parent | 82aeef0bf03684b377678c00c05e613f30dca39c (diff) | |
| download | linux-stable-8e1a254099dcb7ea5eacd503799b641208300ff3.tar.gz linux-stable-8e1a254099dcb7ea5eacd503799b641208300ff3.tar.bz2 linux-stable-8e1a254099dcb7ea5eacd503799b641208300ff3.zip | |
Merge tag 'iommu-fixes-v3.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
"A couple of fixes from the IOMMU side:
- some small fixes for the new ARM-SMMU driver
- a register offset correction for VT-d
- add MAINTAINERS entry for drivers/iommu
Overall no really big or intrusive changes"
* tag 'iommu-fixes-v3.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
x86/iommu: correct ICS register offset
MAINTAINERS: add overall IOMMU section
iommu/arm-smmu: don't enable SMMU device until probing has completed
iommu/arm-smmu: fix iommu_present() test in init
iommu/arm-smmu: fix a signedness bug
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5678de36d9b3..8a0cbf3cf2c8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4476,6 +4476,13 @@ L: linux-serial@vger.kernel.org S: Maintained F: drivers/tty/serial/ioc3_serial.c +IOMMU DRIVERS +M: Joerg Roedel <joro@8bytes.org> +L: iommu@lists.linux-foundation.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git +S: Maintained +F: drivers/iommu/ + IP MASQUERADING M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar> S: Maintained |