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

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index b618b1e..060e32a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -157,9 +157,11 @@ S: Maintained
 F:     drivers/net/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
+M:     Greg Kroah-Hartman <gregkh@suse.de>
 L:     linux-serial@vger.kernel.org
 W:     http://serial.sourceforge.net
-S:     Orphan
+S:     Maintained
+T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 F:     drivers/serial/8250*
 F:     include/linux/serial_8250.h
 
@@ -2064,14 +2066,16 @@ F:      drivers/block/drbd/
 F:     lib/lru_cache.c
 F:     Documentation/blockdev/drbd/
 
-DRIVER CORE, KOBJECTS, AND SYSFS
+DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
 M:     Greg Kroah-Hartman <gregkh@suse.de>
 T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:     Supported
 F:     Documentation/kobject.txt
 F:     drivers/base/
 F:     fs/sysfs/
+F:     fs/debugfs/
 F:     include/linux/kobj*
+F:     include/linux/debugfs.h
 F:     lib/kobj*
 
 DRM DRIVERS
@@ -3351,6 +3355,12 @@ F:       fs/jbd*/
 F:     include/linux/ext*jbd*.h
 F:     include/linux/jbd*.h
 
+JSM Neo PCI based serial card
+M:     Breno Leitao <leitao@linux.vnet.ibm.com>
+L:     linux-serial@vger.kernel.org
+S:     Maintained
+F:     drivers/serial/jsm/
+
 K8TEMP HARDWARE MONITORING DRIVER
 M:     Rudolf Marek <r.marek@assembler.cz>
 L:     lm-sensors@lm-sensors.org