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

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4cc17b993b6a4dc8d95c5a868817eee812cabc2b..4c715a7e059a70f914ad49f9d6b747964e129c5f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -30,8 +30,11 @@ trivial patch so apply some common sense.
        job the maintainers (and especially Linus) do is to keep things
        looking the same. Sometimes this means that the clever hack in
        your driver to get around a problem actually needs to become a
-       generalized kernel feature ready for next time. See
-       Documentation/CodingStyle for guidance here.
+       generalized kernel feature ready for next time.
+
+       PLEASE check your patch with the automated style checker
+       (scripts/checkpatch.pl) to catch trival style violations.
+       See Documentation/CodingStyle for guidance here.
 
        PLEASE try to include any credit lines you want added with the
        patch. It avoids people being missed off by mistake and makes
@@ -779,11 +782,6 @@ M: rathamahata@php4.ru
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
-BERKSHIRE PRODUCTS PC WATCHDOG DRIVER
-P:     Kenji Hollis
-W:     http://ftp.bitgate.com/pcwd/
-S:     Maintained
-
 BFS FILE SYSTEM
 P:     Tigran A. Aivazian
 M:     tigran@aivazian.fsnet.co.uk
@@ -972,6 +970,15 @@ M: johannes@sipsolutions.net
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
 
+CHECKPATCH
+P:     Andy Whitcroft
+M:     apw@shadowen.org
+P:     Randy Dunlap
+M:     rdunlap@xenotime.net
+P:     Joel Schopp
+M:     jschopp@austin.ibm.com
+S:     Supported
+
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:     Steve French
 M:     sfrench@samba.org
@@ -1475,6 +1482,13 @@ L:       linux-usb-devel@lists.sourceforge.net
 L:     linuxppc-embedded@ozlabs.org
 S:     Maintained
 
+FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
+P:     Li Yang
+M:     leoli@freescale.com
+L:     netdev@vger.kernel.org
+L:     linuxppc-embedded@ozlabs.org
+S:     Maintained
+
 FILE LOCKING (flock() and fcntl()/lockf())
 P:     Matthew Wilcox
 M:     matthew@wil.cx
@@ -1486,6 +1500,14 @@ P:       Alexander Viro
 M:     viro@zeniv.linux.org.uk
 S:     Maintained
 
+FIREWIRE SUBSYSTEM
+P:     Kristian Hoegsberg, Stefan Richter
+M:     krh@redhat.com, stefanr@s5r6.in-berlin.de
+L:     linux1394-devel@lists.sourceforge.net
+W:     http://www.linux1394.org/
+T:     git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
+S:     Maintained
+
 FIRMWARE LOADER (request_firmware)
 L:     linux-kernel@vger.kernel.org
 S:     Orphan
@@ -2880,8 +2902,8 @@ W:        ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
 S:     Supported
 
 PRISM54 WIRELESS DRIVER
-P:     Prism54 Development Team
-M:     developers@islsm.org
+P:     Luis R. Rodriguez
+M:     mcgrof@gmail.com
 L:     linux-wireless@vger.kernel.org
 W:     http://prism54.org
 S:     Maintained
@@ -2998,7 +3020,7 @@ S:        Maintained
 REISERFS FILE SYSTEM
 P:     Hans Reiser
 M:     reiserfs-dev@namesys.com
-L:     reiserfs-list@namesys.com
+L:     reiserfs-devel@vger.kernel.org
 W:     http://www.namesys.com
 S:     Supported
 
@@ -3525,7 +3547,7 @@ S:        Maintained
 
 TULIP NETWORK DRIVER
 P:     Valerie Henson
-M:     val_henson@linux.intel.com
+M:     val@nmt.edu
 L:     tulip-users@lists.sourceforge.net
 W:     http://sourceforge.net/projects/tulip/
 S:     Maintained
@@ -3877,10 +3899,6 @@ S:       Maintained
 
 UCLINUX FOR NEC V850
 P:     Miles Bader
-M:     uclinux-v850@lsi.nec.co.jp
-W:     http://www.ic.nec.co.jp/micro/uclinux/eng/
-W:     http://www.ee.nec.de/uclinux/
-S:     Supported
 
 UCLINUX FOR RENESAS H8/300
 P:     Yoshinori Sato
@@ -3889,10 +3907,10 @@ W:      http://uclinux-h8.sourceforge.jp/
 S:     Supported
 
 UFS FILESYSTEM
-P: Evgeniy Dushistov
-M: dushistov@mail.ru
-L: linux-kernel@vger.kernel.org
-S: Maintained
+P:     Evgeniy Dushistov
+M:     dushistov@mail.ru
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
 
 USB DIAMOND RIO500 DRIVER
 P:     Cesar Miquel