Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of:

	arch/powerpc/Kconfig

1 files changed, 6 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8619861dd34..e4d74669289 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -376,6 +376,12 @@ L:	linux-geode@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:      Supported
 
+AMD IOMMU (AMD-VI)
+P:      Joerg Roedel
+M:      joerg.roedel@amd.com
+L:      iommu@lists.linux-foundation.org
+S:      Supported
+
 AMS (Apple Motion Sensor) DRIVER
 P:      Stelian Pop
 M:      stelian@popies.net