Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2af78e965dd724e6c4a18277092497a6ab38a2e3..f038dca34ee826b543db0d54f40623e954e5bf72 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -116,6 +116,12 @@ M: [email protected]
 L:     [email protected]
 S:     Maintained
 
+YEALINK PHONE DRIVER
+P:     Henk Vergonet
+M:     [email protected]
+L:     [email protected]
+S:     Maintained
+
 8139CP 10/100 FAST ETHERNET DRIVER
 P:     Jeff Garzik
 M:     [email protected]
@@ -620,6 +626,12 @@ M: [email protected]
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 
+CYBLAFB FRAMEBUFFER DRIVER
+P:     Knut Petersen
+M:     [email protected]
+L:     [email protected]
+S:     Maintained
+
 CYCLADES 2X SYNC CARD DRIVER
 P:     Arnaldo Carvalho de Melo
 M:     [email protected]
@@ -822,6 +834,13 @@ L: [email protected]
 W:     http://sourceforge.net/projects/emu10k1/
 S:     Maintained
 
+EMULEX LPFC FC SCSI DRIVER
+P:      James Smart
+M:      [email protected]
+L:      [email protected]
+W:      http://sourceforge.net/projects/lpfcxxxx
+S:      Supported
+
 EPSON 1355 FRAMEBUFFER DRIVER
 P:     Christopher Hoover
 M:     [email protected], [email protected]
@@ -912,6 +931,13 @@ L: [email protected]
 W:     http://sourceforge.net/projects/ftape
 S:     Orphan
 
+FUSE: FILESYSTEM IN USERSPACE
+P:     Miklos Szeredi
+M:     [email protected]
+L:     [email protected]
+W:     http://fuse.sourceforge.net/
+S:     Maintained
+
 FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 P:     Rik Faith
 M:     [email protected]
@@ -1806,13 +1832,6 @@ M:       [email protected]
 L:     [email protected]
 S:     Maintained
 
-PCI ID DATABASE
-P:     Martin Mares
-M:     [email protected]
-L:     [email protected]
-W:     http://pciids.sourceforge.net/
-S:     Maintained
-
 PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
 P:     Thomas Sailer
 M:     [email protected]
@@ -2678,6 +2697,17 @@ L:       [email protected]
 W:     http://rio500.sourceforge.net
 S:     Maintained
 
+V9FS FILE SYSTEM
+P:      Eric Van Hensbergen
+M:      [email protected]
+P:      Ron Minnich
+M:      [email protected]
+P:      Latchesar Ionkov
+M:      [email protected]
+L:      [email protected]
+W:      http://v9fs.sf.net
+S:      Maintained
+
 VIDEO FOR LINUX
 P:     Mauro Carvalho Chehab
 M:     [email protected]