[Bluetooth] Fix NULL pointer dereference in HCI line discipline

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 41a4b47..bd558ac 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1038,6 +1038,8 @@ S:        Maintained
 CONEXANT ACCESSRUNNER USB DRIVER
 P:     Simon Arlott
 M:     cxacru@fire.lp0.eu
+L:     accessrunner-general@lists.sourceforge.net
+W:     http://accessrunner.sourceforge.net/
 S:     Maintained
 
 CORETEMP HARDWARE MONITORING DRIVER
@@ -1716,12 +1718,6 @@ P:       H. Peter Anvin
 M:     hpa@zytor.com
 S:     Maintained
 
-i810 TCO TIMER WATCHDOG
-P:     Nils Faerber
-M:     nils@kernelconcepts.de
-W:     http://www.kernelconcepts.de/
-S:     Maintained
-
 IA64 (Itanium) PLATFORM
 P:     Tony Luck
 M:     tony.luck@intel.com
@@ -2646,6 +2642,12 @@ M:       corbet@lwn.net
 L:     video4linux-list@redhat.com
 S:     Maintained
 
+ONENAND FLASH DRIVER
+P:     Kyungmin Park
+M:     kyungmin.park@samsung.com
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+
 ONSTREAM SCSI TAPE DRIVER
 P:     Willem Riede
 M:     osst@riede.org
@@ -2800,7 +2802,7 @@ L:        linux-abi-devel@lists.sourceforge.net
 S:     Maintained
 
 PHRAM MTD DRIVER
-P:     Jörn Engel
+P:     Jörn Engel
 M:     joern@wh.fh-wedel.de
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
@@ -3074,7 +3076,7 @@ T:        git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
 S:     Maintained
 
 SCSI TAPE DRIVER
-P:     Kai Mäkisara
+P:     Kai Mäkisara
 M:     Kai.Makisara@kolumbus.fi
 L:     linux-scsi@vger.kernel.org
 S:     Maintained