Merge branch 'devel' into next

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 56a2f678019e7c067e62ce7a95c1fb86ade5df2d..fc6c005c531a3fa51e3cc2095254e217cf292e90 100644 (file)
--- 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
@@ -1680,6 +1686,13 @@ L:       linuxppc-embedded@ozlabs.org
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
+FREESCALE I2C CPM DRIVER
+P:     Jochen Friedrich
+M:     jochen@scram.de
+L:     linuxppc-dev@ozlabs.org
+L:     i2c@lm-sensors.org
+S:     Maintained
+
 FREESCALE SOC FS_ENET DRIVER
 P:     Pantelis Antoniou
 M:     pantelis.antoniou@gmail.com
@@ -1764,6 +1777,11 @@ M:       hch@infradead.org
 W:     ftp://ftp.openlinux.org/pub/people/hch/vxfs
 S:     Maintained
 
+FTRACE
+P:     Steven Rostedt
+M:     srostedt@redhat.com
+S:     Maintained
+
 FUJITSU FR-V (FRV) PORT
 P:     David Howells
 M:     dhowells@redhat.com