diff --git a/[refs] b/[refs]
index 6a527e45da9d..a731e87d4d63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 808601b75804475c9022f6375e76b7c62c99a10a
+refs/heads/master: f400c82efb474b2ccf01c796b60b36408f7845a3
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 6a588873cf8d..462be605aa3c 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/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>