diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-06 15:35:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-06 15:35:14 -0500 |
| commit | 59d74026fa4b5df72a268f1e9578af500154ad07 (patch) | |
| tree | 4b6058de06d70c5080a63178475708a686954c84 /MAINTAINERS | |
| parent | a0417fa3a18a14be1f4d9cffcf378a7c42d92a91 (diff) | |
| parent | 8926574c4d0055ca4c4a02d1f6b2c249d01a0621 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b4568a211d26..f71da55f9ac6 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/ |