Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c07b1d7bb02ea9b6cf3e60ff5a84955ba756136d..7d6e12dbdffaefd25c8feb379eebffbcef83d391 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4510,11 +4510,21 @@ S:      Maintained
 F:     arch/arm/*omap*/*clock*
 
 OMAP POWER MANAGEMENT SUPPORT
-M:     Kevin Hilman <khilman@deeprootsystems.com>
+M:     Kevin Hilman <khilman@ti.com>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
 F:     arch/arm/*omap*/*pm*
 
+OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT
+M:     Rajendra Nayak <rnayak@ti.com>
+M:     Paul Walmsley <paul@pwsan.com>
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
+F:     arch/arm/mach-omap2/powerdomain44xx.c
+F:     arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
+F:     arch/arm/mach-omap2/clockdomain44xx.c
+
 OMAP AUDIO SUPPORT
 M:     Jarkko Nikula <jhnikula@gmail.com>
 L:     alsa-devel@alsa-project.org (subscribers-only)
@@ -5359,8 +5369,7 @@ S:        Supported
 F:     drivers/s390/crypto/
 
 S390 ZFCP DRIVER
-M:     Christof Schmitt <christof.schmitt@de.ibm.com>
-M:     Swen Schillig <swen@vnet.ibm.com>
+M:     Steffen Maier <maier@linux.vnet.ibm.com>
 M:     linux390@de.ibm.com
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -5677,7 +5686,8 @@ F:        arch/arm/mach-s3c2410/bast-ide.c
 F:     arch/arm/mach-s3c2410/bast-irq.c
 
 TI DAVINCI MACHINE SUPPORT
-M:     Kevin Hilman <khilman@deeprootsystems.com>
+M:     Sekhar Nori <nsekhar@ti.com>
+M:     Kevin Hilman <khilman@ti.com>
 L:     davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
 Q:     http://patchwork.kernel.org/project/linux-davinci/list/
 S:     Supported
@@ -6117,6 +6127,7 @@ S:        Supported
 F:     arch/tile/
 F:     drivers/tty/hvc/hvc_tile.c
 F:     drivers/net/tile/
+F:     drivers/edac/tile_edac.c
 
 TLAN NETWORK DRIVER
 M:     Samuel Chessman <chessman@tux.org>