diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-29 12:42:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-29 12:42:14 -0400 |
| commit | 8732baafc3f19e69df683c3f0f36c13cec746fb9 (patch) | |
| tree | 9059d0fe8f2a49425edab88ea8e7d5337e13e66c /MAINTAINERS | |
| parent | 7a9bc9b81a5bc6e44ebc80ef781332e4385083f2 (diff) | |
| parent | 42fb0b0278e6b9a44bee8adec051de5f43e10b2b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5095340716cf..d350dae2ce1c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1595,6 +1595,7 @@ M: Arend van Spriel <arend@broadcom.com> | |||
| 1595 | M: Franky (Zhenhui) Lin <frankyl@broadcom.com> | 1595 | M: Franky (Zhenhui) Lin <frankyl@broadcom.com> |
| 1596 | M: Kan Yan <kanyan@broadcom.com> | 1596 | M: Kan Yan <kanyan@broadcom.com> |
| 1597 | L: linux-wireless@vger.kernel.org | 1597 | L: linux-wireless@vger.kernel.org |
| 1598 | L: brcm80211-dev-list@broadcom.com | ||
| 1598 | S: Supported | 1599 | S: Supported |
| 1599 | F: drivers/net/wireless/brcm80211/ | 1600 | F: drivers/net/wireless/brcm80211/ |
| 1600 | 1601 | ||