/spare/repo/netdev-2.6 branch 'ieee80211'

1 files changed, 20 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 423103e5d955..4b390695888b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1176,6 +1176,12 @@ L:	linux-input@atrey.karlin.mff.cuni.cz
 L:      linux-joystick@atrey.karlin.mff.cuni.cz
 S:      Maintained
 
+INOTIFY
+P:      John McCutchan and Robert Love
+M:      ttb@tentacle.dhs.org and rml@novell.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 INTEL 810/815 FRAMEBUFFER DRIVER
 P:      Antonino Daplas
 M:      adaplas@pol.net
@@ -1417,13 +1423,20 @@ W:	http://www.penguinppc.org/
 L:      linuxppc-embedded@ozlabs.org
 S:      Maintained
 
-LINUX FOR POWERPC EMBEDDED PPC8XX AND BOOT CODE
+LINUX FOR POWERPC BOOT CODE
 P:      Tom Rini
 M:      trini@kernel.crashing.org
 W:      http://www.penguinppc.org/
 L:      linuxppc-embedded@ozlabs.org
 S:      Maintained
 
+LINUX FOR POWERPC EMBEDDED PPC8XX
+P:      Marcelo Tosatti
+M:      marcelo.tosatti@cyclades.com
+W:      http://www.penguinppc.org/
+L:      linuxppc-embedded@ozlabs.org
+S:      Maintained
+
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 P:     Kumar Gala
 M:     kumar.gala@freescale.com
@@ -2427,6 +2440,12 @@ L:	linux-usb-users@lists.sourceforge.net
 L:      linux-usb-devel@lists.sourceforge.net
 S:      Maintained
 
+USB OPTION-CARD DRIVER
+P:      Matthias Urlichs
+M:      smurf@smurf.noris.de
+L:      linux-usb-devel@lists.sourceforge.net
+S:      Maintained
+
 USB OV511 DRIVER
 P:      Mark McClelland
 M:      mmcclell@bigfoot.com