diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-09 13:49:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-09 13:49:02 -0700 |
| commit | dc5a18941b4226846f0c5994e4f45bc685f7bcfe (patch) | |
| tree | 8189cc7586fb875484bce2a7122f2152343904bb /MAINTAINERS | |
| parent | 461df4ded3a143f09f9d0e870e7b16b787dc0591 (diff) | |
| parent | c773298788598a26e325bc2639877c76818943e3 (diff) | |
| download | linux-0-day-dc5a18941b4226846f0c5994e4f45bc685f7bcfe.tar.gz linux-0-day-dc5a18941b4226846f0c5994e4f45bc685f7bcfe.tar.xz | |
Merge Linus's tree into staging-next
This was done to resolve the conflicts that were in a number of files
due to changes done upstream with others done in the staging-next
branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bbe49d8c22afb..31c25269012cd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1533,9 +1533,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/ |