aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-20 16:44:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-20 16:44:40 -0700
commit0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60 (patch)
tree5324be527053594218107f3890c919ed8fae1f3d /MAINTAINERS
parent36ff4a5517779355f4bd62030cdb8498c3954f29 (diff)
parentf299470a15ab3057afbf598cec59246a90ade449 (diff)
downloadmrst-s0i3-test-0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60.tar.gz
mrst-s0i3-test-0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60.tar.xz
mrst-s0i3-test-0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: musb: MAINTAINERS: Fix my mail address USB: serial/mos*: prevent reading uninitialized stack memory USB: otg: twl4030: fix phy initialization(v1) USB: EHCI: Disable langwell/penwell LPM capability usb: musb_debugfs: don't use the struct file private_data field with seq_files
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 411b0d04f69..50b8148448f 100644
--- a/MAINTAINERS
+++ b/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