Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 907094f07142650066457f50b1561a80ceab0328..79c711e6074bb763b483a747e24386585c35571b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1870,8 +1870,10 @@ T:       quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
 S:     Maintained
 
 IDE/ATAPI CDROM DRIVER
+P:     Borislav Petkov
+M:     bbpetkov@yahoo.de
 L:     linux-ide@vger.kernel.org
-S:     Unmaintained
+S:     Maintained
 
 IDE/ATAPI FLOPPY DRIVERS
 P:     Paul Bristow
@@ -4054,6 +4056,14 @@ L:       user-mode-linux-user@lists.sourceforge.net
 W:     http://user-mode-linux.sourceforge.net
 S:     Maintained
 
+USERSPACE I/O (UIO)
+P:     Hans J. Koch
+M:     hjk@linutronix.de
+P:     Greg Kroah-Hartman
+M:     gregkh@suse.de
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 FAT/VFAT/MSDOS FILESYSTEM:
 P:     OGAWA Hirofumi
 M:     hirofumi@mail.parknet.co.jp