diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 14:06:53 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-01 14:07:00 +1000 |
| commit | 4122a4b040e408296989cad33adbb6b2d32a9257 (patch) | |
| tree | b168a3b0d2f411c3246596d0b71bf3a2546ab682 /MAINTAINERS | |
| parent | 22638a6266c89498aa3d34f933db2826e9de5d43 (diff) | |
| parent | 0656bb352080982f960bfff2b78602a5071c909f (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/Makefile
drivers/staging/batman-adv/hard-interface.c
drivers/staging/mrst-touchscreen/Makefile
drivers/staging/mrst-touchscreen/intel-mid-touch.c
drivers/staging/ti-st/st.h
drivers/staging/ti-st/st_core.h
drivers/staging/ti-st/st_kim.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 154f8170da37..5d7d67a5b971 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1406,6 +1406,14 @@ L: netdev@vger.kernel.org S: Supported 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> +L: linux-wireless@vger.kernel.org +S: Supported +F: drivers/staging/brcm80211/ + BROCADE BFA FC SCSI DRIVER M: Jing Huang <huangj@brocade.com> L: linux-scsi@vger.kernel.org |