Merge branch 'pm-sr' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6a588873cf8d2da8b00f803a1dcd8d96841292bd..462be605aa3c3194a3561df7364c83b22078bb1c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4328,6 +4328,20 @@ M:       Deepak Saxena <dsaxena@plexity.net>
 S:     Maintained
 F:     drivers/char/hw_random/omap-rng.c
 
+OMAP HWMOD SUPPORT
+M:     Benoît Cousson <b-cousson@ti.com>
+M:     Paul Walmsley <paul@pwsan.com>
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     arch/arm/mach-omap2/omap_hwmod.c
+F:     arch/arm/plat-omap/include/plat/omap_hwmod.h
+
+OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
+M:     Benoît Cousson <b-cousson@ti.com>
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+
 OMAP USB SUPPORT
 M:     Felipe Balbi <balbi@ti.com>
 M:     David Brownell <dbrownell@users.sourceforge.net>