Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cf7ff78..23b9584 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3596,7 +3596,6 @@ S:        Maintained
 F:     drivers/hv/
 F:     drivers/hid/hid-hyperv.c
 F:     drivers/net/hyperv/
-F:     drivers/staging/hv/
 
 I2C OVER PARALLEL PORT
 M:     Jean Delvare <khali@linux-fr.org>
@@ -3789,6 +3788,15 @@ M:       Stanislaw Gruszka <stf_xl@wp.pl>
 S:     Maintained
 F:     drivers/usb/atm/ueagle-atm.c
 
+INDUSTRY PACK SUBSYSTEM (IPACK)
+M:     Samuel Iglesias Gonsalvez <siglesias@igalia.com>
+M:     Jens Taprogge <jens.taprogge@taprogge.org>
+M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+L:     industrypack-devel@lists.sourceforge.net
+W:     http://industrypack.sourceforge.net
+S:     Maintained
+F:     drivers/ipack/
+
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 M:     Mimi Zohar <zohar@us.ibm.com>
 S:     Supported
@@ -7422,6 +7430,7 @@ K:        ^Subject:.*(?i)trivial
 
 TTY LAYER
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+M:     Jiri Slaby <jslaby@suse.cz>
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
 F:     drivers/tty/
@@ -7578,12 +7587,6 @@ L:       linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/usb/storage/uas.c
 
-USB BLOCK DRIVER (UB ub)
-M:     Pete Zaitcev <zaitcev@redhat.com>
-L:     linux-usb@vger.kernel.org
-S:     Supported
-F:     drivers/block/ub.c
-
 USB CDC ETHERNET DRIVER
 M:     Oliver Neukum <oliver@neukum.org>
 L:     linux-usb@vger.kernel.org