Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 03c516a..aca102f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1423,7 +1423,9 @@ F:        drivers/net/tg3.*
 BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 M:     Brett Rudley <brudley@broadcom.com>
 M:     Henry Ptasinski <henryp@broadcom.com>
-M:     Nohee Ko <noheek@broadcom.com>
+M:     Dowan Kim <dowan@broadcom.com>
+M:     Roland Vossen <rvossen@broadcom.com>
+M:     Arend van Spriel <arend@broadcom.com>
 L:     linux-wireless@vger.kernel.org
 S:     Supported
 F:     drivers/staging/brcm80211/
@@ -2271,6 +2273,14 @@ W:       http://acpi4asus.sf.net
 S:     Maintained
 F:     drivers/platform/x86/eeepc-laptop.c
 
+EEEPC WMI EXTRAS DRIVER
+M:     Corentin Chary <corentincj@iksaif.net>
+L:     acpi4asus-user@lists.sourceforge.net
+L:     platform-driver-x86@vger.kernel.org
+W:     http://acpi4asus.sf.net
+S:     Maintained
+F:     drivers/platform/x86/eeepc-wmi.c
+
 EFIFB FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
 M:     Peter Jones <pjones@redhat.com>
@@ -5930,7 +5940,8 @@ F:        drivers/net/tlan.*
 TOMOYO SECURITY MODULE
 M:     Kentaro Takeda <takedakn@nttdata.co.jp>
 M:     Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-L:     tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for developers and users in English)
+L:     tomoyo-dev-en@lists.sourceforge.jp (subscribers-only, for developers in English)
+L:     tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for users in English)
 L:     tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
 L:     tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
 W:     http://tomoyo.sourceforge.jp/