Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[zynq/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 606528bb16afc9ae180a299efb9346ddf4c06cbd..871818cf9409a5adb5c6dc6aa0938c1f17b7b7cb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7887,7 +7887,7 @@ S:        Maintained
 F:     arch/arm/*omap*/*clock*
 
 OMAP POWER MANAGEMENT SUPPORT
-M:     Kevin Hilman <khilman@deeprootsystems.com>
+M:     Kevin Hilman <khilman@kernel.org>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
 F:     arch/arm/*omap*/*pm*
@@ -7991,7 +7991,7 @@ F:        arch/arm/*omap*/usb*
 OMAP GPIO DRIVER
 M:     Grygorii Strashko <grygorii.strashko@ti.com>
 M:     Santosh Shilimkar <ssantosh@kernel.org>
-M:     Kevin Hilman <khilman@deeprootsystems.com>
+M:     Kevin Hilman <khilman@kernel.org>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/gpio-omap.txt
@@ -10048,7 +10048,7 @@ F:      arch/arm/mach-s3c24xx/bast-irq.c
 
 TI DAVINCI MACHINE SUPPORT
 M:     Sekhar Nori <nsekhar@ti.com>
-M:     Kevin Hilman <khilman@deeprootsystems.com>
+M:     Kevin Hilman <khilman@kernel.org>
 T:     git git://gitorious.org/linux-davinci/linux-davinci.git
 Q:     http://patchwork.kernel.org/project/linux-davinci/list/
 S:     Supported