Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[powerpc.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 1561f33..41a4b47 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -382,6 +382,12 @@ L: linux-laptop@vger.kernel.org
 W:     http://www.canb.auug.org.au/~sfr/
 S:     Supported
 
+APPLE SMC DRIVER
+P:     Nicolas Boichat
+M:     nicolas@boichat.ch
+L:     mactel-linux-devel@lists.sourceforge.net
+S:     Maintained
+
 APPLETALK NETWORK LAYER
 P:     Arnaldo Carvalho de Melo
 M:     acme@ghostprotocols.net
@@ -673,6 +679,7 @@ AUXILIARY DISPLAY DRIVERS
 P:     Miguel Ojeda Sandonis
 M:     maxextreme@gmail.com
 L:     linux-kernel@vger.kernel.org
+W:     http://auxdisplay.googlepages.com/
 S:     Maintained
 
 AVR32 ARCHITECTURE
@@ -937,12 +944,14 @@ CFAG12864B LCD DRIVER
 P:     Miguel Ojeda Sandonis
 M:     maxextreme@gmail.com
 L:     linux-kernel@vger.kernel.org
+W:     http://auxdisplay.googlepages.com/
 S:     Maintained
 
 CFAG12864BFB LCD FRAMEBUFFER DRIVER
 P:     Miguel Ojeda Sandonis
 M:     maxextreme@gmail.com
 L:     linux-kernel@vger.kernel.org
+W:     http://auxdisplay.googlepages.com/
 S:     Maintained
 
 CFG80211 and NL80211
@@ -2027,7 +2036,7 @@ P:        Vivek Goyal
 M:     vgoyal@in.ibm.com
 P:     Haren Myneni
 M:     hbabu@us.ibm.com
-L:     fastboot@lists.linux-foundation.org
+L:     kexec@lists.infradead.org
 L:     linux-kernel@vger.kernel.org
 W:     http://lse.sourceforge.net/kdump/
 S:     Maintained
@@ -2077,7 +2086,7 @@ P:        Eric Biederman
 M:     ebiederm@xmission.com
 W:     http://www.xmission.com/~ebiederm/files/kexec/
 L:     linux-kernel@vger.kernel.org
-L:     fastboot@lists.linux-foundation.org
+L:     kexec@lists.infradead.org
 S:     Maintained
 
 KPROBES
@@ -2096,6 +2105,7 @@ KS0108 LCD CONTROLLER DRIVER
 P:     Miguel Ojeda Sandonis
 M:     maxextreme@gmail.com
 L:     linux-kernel@vger.kernel.org
+W:     http://auxdisplay.googlepages.com/
 S:     Maintained
 
 LAPB module
@@ -3110,6 +3120,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