diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:26:39 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:26:39 -0500 |
| commit | 8926574c4d0055ca4c4a02d1f6b2c249d01a0621 (patch) | |
| tree | 0c02c3cfff77e868d605246204add4664503b2af /MAINTAINERS | |
| parent | c056b734e54e12f38f34a2583a4824e6cecc16c1 (diff) | |
| parent | b0302aba812bcc39291cdab9ad7e37008f352a91 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b4568a211d2..f71da55f9ac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1412,7 +1412,7 @@ F: net/ax25/ | |||
| 1412 | B43 WIRELESS DRIVER | 1412 | B43 WIRELESS DRIVER |
| 1413 | M: Stefano Brivio <stefano.brivio@polimi.it> | 1413 | M: Stefano Brivio <stefano.brivio@polimi.it> |
| 1414 | L: linux-wireless@vger.kernel.org | 1414 | L: linux-wireless@vger.kernel.org |
| 1415 | L: b43-dev@lists.infradead.org (moderated for non-subscribers) | 1415 | L: b43-dev@lists.infradead.org |
| 1416 | W: http://linuxwireless.org/en/users/Drivers/b43 | 1416 | W: http://linuxwireless.org/en/users/Drivers/b43 |
| 1417 | S: Maintained | 1417 | S: Maintained |
| 1418 | F: drivers/net/wireless/b43/ | 1418 | F: drivers/net/wireless/b43/ |
| @@ -1421,6 +1421,7 @@ B43LEGACY WIRELESS DRIVER | |||
| 1421 | M: Larry Finger <Larry.Finger@lwfinger.net> | 1421 | M: Larry Finger <Larry.Finger@lwfinger.net> |
| 1422 | M: Stefano Brivio <stefano.brivio@polimi.it> | 1422 | M: Stefano Brivio <stefano.brivio@polimi.it> |
| 1423 | L: linux-wireless@vger.kernel.org | 1423 | L: linux-wireless@vger.kernel.org |
| 1424 | L: b43-dev@lists.infradead.org | ||
| 1424 | W: http://linuxwireless.org/en/users/Drivers/b43 | 1425 | W: http://linuxwireless.org/en/users/Drivers/b43 |
| 1425 | S: Maintained | 1426 | S: Maintained |
| 1426 | F: drivers/net/wireless/b43legacy/ | 1427 | F: drivers/net/wireless/b43legacy/ |