Merge git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ba05e8058689dc0471ddb9fe753290075404774d..58b16038baea02ba54bbd115ea7964964cbc7f83 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1595,7 +1595,7 @@ P:        Alexander Viro
 M:     viro@zeniv.linux.org.uk
 S:     Maintained
 
-FIREWIRE SUBSYSTEM
+FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
 P:     Kristian Hoegsberg, Stefan Richter
 M:     krh@redhat.com, stefanr@s5r6.in-berlin.de
 L:     linux1394-devel@lists.sourceforge.net
@@ -1917,7 +1917,7 @@ L:        linux-ide@vger.kernel.org
 L:     linux-scsi@vger.kernel.org
 S:     Orphan
 
-IEEE 1394 SUBSYSTEM
+IEEE 1394 SUBSYSTEM (drivers/ieee1394)
 P:     Ben Collins
 M:     ben.collins@ubuntu.com
 P:     Stefan Richter
@@ -2247,7 +2247,7 @@ P:        J. Bruce Fields
 M:     bfields@fieldses.org
 P:     Neil Brown
 M:     neilb@suse.de
-L:     nfs@lists.sourceforge.net
+L:     linux-nfs@vger.kernel.org
 W:     http://nfs.sourceforge.net/
 S:     Supported
 
@@ -3053,7 +3053,6 @@ M:        cbou@mail.ru
 P:     David Woodhouse
 M:     dwmw2@infradead.org
 L:     linux-kernel@vger.kernel.org
-L:     kernel-discuss@handhelds.org
 T:     git git.infradead.org/battery-2.6.git
 S:     Maintained
 
@@ -3571,6 +3570,9 @@ S:        Maintained
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
 P:     Liam Girdwood
 M:     liam.girdwood@wolfsonmicro.com
+P:     Mark Brown
+M:     broonie@opensource.wolfsonmicro.com
+T:     git opensource.wolfsonmicro.com/linux-2.6-asoc
 L:     alsa-devel@alsa-project.org (subscribers-only)
 S:     Supported
 
@@ -4082,6 +4084,12 @@ L:       video4linux-list@redhat.com
 W:     http://www.linux-projects.org
 S:     Maintained
 
+USB WIRELESS RNDIS DRIVER (rndis_wlan)
+P:     Jussi Kivilinna
+M:     jussi.kivilinna@mbnet.fi
+L:     linux-wireless@vger.kernel.org
+S:     Maintained
+
 USB ZC0301 DRIVER
 P:     Luca Risolia
 M:     luca.risolia@studio.unibo.it