Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

[powerpc.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 415011c..77bff8c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -981,6 +981,11 @@ M: mhw@wittsend.com
 W:     http://www.wittsend.com/computone.html
 S:     Maintained
 
+CONEXANT ACCESSRUNNER USB DRIVER
+P:     Simon Arlott
+M:     cxacru@fire.lp0.eu
+S:     Maintained
+
 COSA/SRP SYNC SERIAL DRIVER
 P:     Jan "Yenya" Kasprzak
 M:     kas@fi.muni.cz
@@ -1389,6 +1394,13 @@ L:       linuxppc-embedded@ozlabs.org
 L:     netdev@vger.kernel.org
 S:     Maintained
 
+FREESCALE HIGHSPEED USB DEVICE DRIVER
+P:     Li Yang
+M:     leoli@freescale.com
+L:     linux-usb-devel@lists.sourceforge.net
+L:     linuxppc-embedded@ozlabs.org
+S:     Maintained
+
 FILE LOCKING (flock() and fcntl()/lockf())
 P:     Matthew Wilcox
 M:     matthew@wil.cx