1 files changed, 16 insertions, 4 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f63d03a6c865..124b9508ae2e 100644
--- 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
@@ -972,6 +975,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
@@ -2888,8 +2900,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