diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-20 15:17:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-20 15:17:02 +1000 |
| commit | b5b510198ebf0b068a73e4b96ddd1ebdc017083c (patch) | |
| tree | 1f96166ebef6706d1b0ca2324c02bb0db4493eb5 /MAINTAINERS | |
| parent | d9d50f9347946ee7571d976f515bf09f4f762328 (diff) | |
| parent | dc5a18941b4226846f0c5994e4f45bc685f7bcfe (diff) | |
Merge remote-tracking branch 'staging/staging-next'
Conflicts:
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmfmac/wl_iw.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index eaa26c78b330..a26e9ecc2450 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1534,9 +1534,10 @@ F: drivers/net/tg3.* BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER M: Brett Rudley <brudley@broadcom.com> M: Henry Ptasinski <henryp@broadcom.com> -M: Dowan Kim <dowan@broadcom.com> M: Roland Vossen <rvossen@broadcom.com> M: Arend van Spriel <arend@broadcom.com> +M: Franky (Zhenhui) Lin <frankyl@broadcom.com> +M: Kan Yan <kanyan@broadcom.com> L: linux-wireless@vger.kernel.org S: Supported F: drivers/staging/brcm80211/ |