[Bluetooth] Fix NULL pointer dereference in HCI line discipline

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3b46f43..bd558ac 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1718,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
@@ -2648,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