Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
[linux-2.6.git] / MAINTAINERS
index 381190c..494059d 100644 (file)
@@ -4407,7 +4407,7 @@ W:        http://www.nongnu.org/orinoco/
 S:     Maintained
 F:     drivers/net/wireless/orinoco/
 
-OSD LIBRARY
+OSD LIBRARY and FILESYSTEM
 P:     Boaz Harrosh
 M:     bharrosh@panasas.com
 P:     Benny Halevy
@@ -4416,6 +4416,9 @@ L:        osd-dev@open-osd.org
 W:     http://open-osd.org
 T:     git git://git.open-osd.org/open-osd.git
 S:     Maintained
+F:     drivers/scsi/osd/
+F:     drivers/include/scsi/osd_*
+F:     fs/exofs/
 
 P54 WIRELESS DRIVER
 P:     Michael Wu
@@ -5803,17 +5806,17 @@ P:      Jiri Kosina
 M:     trivial@kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
 S:     Maintained
-F:     drivers/char/tty_*
-F:     drivers/serial/serial_core.c
-F:     include/linux/serial_core.h
-F:     include/linux/serial.h
-F:     include/linux/tty.h
 
 TTY LAYER
 P:     Alan Cox
 M:     alan@lxorguk.ukuu.org.uk
 S:     Maintained
 T:     stgit http://zeniv.linux.org.uk/~alan/ttydev/
+F:     drivers/char/tty_*
+F:     drivers/serial/serial_core.c
+F:     include/linux/serial_core.h
+F:     include/linux/serial.h
+F:     include/linux/tty.h
 
 TULIP NETWORK DRIVERS
 P:     Grant Grundler