diff --git a/[refs] b/[refs]
index ab56eb538b87..990ec5d54309 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0846f1868b11cd827bdfeaf4527d8b1b1c0b098
+refs/heads/master: f299470a15ab3057afbf598cec59246a90ade449
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 411b0d04f69b..50b8148448fd 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -3942,7 +3942,7 @@ F:	drivers/char/isicom.c
 F:	include/linux/isicom.h
 
 MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
-M:	Felipe Balbi <felipe.balbi@nokia.com>
+M:	Felipe Balbi <balbi@ti.com>
 L:	linux-usb@vger.kernel.org
 T:	git git://gitorious.org/usb/usb.git
 S:	Maintained
@@ -4240,7 +4240,7 @@ S:	Maintained
 F:	drivers/char/hw_random/omap-rng.c
 
 OMAP USB SUPPORT
-M:	Felipe Balbi <felipe.balbi@nokia.com>
+M:	Felipe Balbi <balbi@ti.com>
 M:	David Brownell <dbrownell@users.sourceforge.net>
 L:	linux-usb@vger.kernel.org
 L:	linux-omap@vger.kernel.org