Merge branch 'akpm'

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 06579ab..fb94add 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -163,9 +163,10 @@ S: Maintained
 F:     drivers/net/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
+P:     Alan Cox
+M:     alan@lxorguk.ukuu.org.uk
 L:     linux-serial@vger.kernel.org
 W:     http://serial.sourceforge.net
-M:     alan@lxorguk.ukuu.org.uk
 S:     Odd Fixes
 F:     drivers/serial/8250*
 F:     include/linux/serial_8250.h
@@ -3383,6 +3384,14 @@ F:       drivers/serial/kgdboc.c
 F:     include/linux/kgdb.h
 F:     kernel/kgdb.c
 
+KMEMCHECK
+P:     Vegard Nossum
+M:     vegardno@ifi.uio.no
+P      Pekka Enberg
+M:     penberg@cs.helsinki.fi
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 KMEMLEAK
 P:     Catalin Marinas
 M:     catalin.marinas@arm.com
@@ -6104,6 +6113,12 @@ L:       linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/rndis_wlan.c
 
+USB XHCI DRIVER
+P:     Sarah Sharp
+M:     sarah.a.sharp@intel.com
+L:     linux-usb@vger.kernel.org
+S:     Supported
+
 USB ZC0301 DRIVER
 P:     Luca Risolia
 M:     luca.risolia@studio.unibo.it