Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 36e48a4..3b46f43 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1038,6 +1038,14 @@ S:       Maintained
 CONEXANT ACCESSRUNNER USB DRIVER
 P:     Simon Arlott
 M:     cxacru@fire.lp0.eu
+L:     accessrunner-general@lists.sourceforge.net
+W:     http://accessrunner.sourceforge.net/
+S:     Maintained
+
+CORETEMP HARDWARE MONITORING DRIVER
+P:     Rudolf Marek
+M:     r.marek@assembler.cz
+L:     lm-sensors@lm-sensors.org
 S:     Maintained
 
 COSA/SRP SYNC SERIAL DRIVER
@@ -2314,6 +2322,12 @@ M:       vandrove@vc.cvut.cz
 L:     linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:     Maintained
 
+MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
+P:     Hans J. Koch
+M:     hjk@linutronix.de
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+
 MEGARAID SCSI DRIVERS
 P:     Neela Syam Kolli
 M:     Neela.Kolli@engenio.com
@@ -2788,7 +2802,7 @@ L:        linux-abi-devel@lists.sourceforge.net
 S:     Maintained
 
 PHRAM MTD DRIVER
-P:     Jörn Engel
+P:     Jörn Engel
 M:     joern@wh.fh-wedel.de
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
@@ -3062,7 +3076,7 @@ T:        git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
 S:     Maintained
 
 SCSI TAPE DRIVER
-P:     Kai Mäkisara
+P:     Kai Mäkisara
 M:     Kai.Makisara@kolumbus.fi
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
@@ -3108,6 +3122,11 @@ L:       selinux@tycho.nsa.gov (subscribers-only, general discussion)
 W:     http://www.nsa.gov/selinux
 S:     Supported
 
+SENSABLE PHANTOM
+P:     Jiri Slaby
+M:     jirislaby@gmail.com
+S:     Maintained
+
 SERIAL ATA (SATA) SUBSYSTEM:
 P:     Jeff Garzik
 M:     jgarzik@pobox.com