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

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 06f8ff9..ee3871e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2305,6 +2305,14 @@ W:       http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:     http://ipw2200.sourceforge.net
 S:     Supported
 
+INTEL WIRELESS WIMAX CONNECTION 2400
+P:     Inaky Perez-Gonzalez
+M:     inaky.perez-gonzalez@intel.com
+M:     linux-wimax@intel.com
+L:     wimax@linuxwimax.org
+S:     Supported
+W:     http://linuxwimax.org
+
 INTEL WIRELESS WIFI LINK (iwlwifi)
 P:     Zhu Yi
 M:     yi.zhu@intel.com
@@ -2982,6 +2990,7 @@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
 P:     Felipe Balbi
 M:     felipe.balbi@nokia.com
 L:     linux-usb@vger.kernel.org
+T:     git gitorious.org:/musb/mainline.git
 S:     Maintained
 
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
@@ -4733,6 +4742,14 @@ M:       zaga@fly.cc.fer.hr
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
 
+WIMAX STACK
+P:     Inaky Perez-Gonzalez
+M:     inaky.perez-gonzalez@intel.com
+M:     linux-wimax@intel.com
+L:     wimax@linuxwimax.org
+S:     Supported
+W:     http://linuxwimax.org
+
 WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
 P:     David Vrabel
 M:     david.vrabel@csr.com