diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-16 14:55:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-16 19:32:19 -0400 |
| commit | e00cf3b9eb7839b952e434a75bff6b99e47337ac (patch) | |
| tree | ef583ab8ac09bf703026650d4bc7777e6a3864d3 /MAINTAINERS | |
| parent | 1a8218e96271790a07dd7065a2ef173e0f67e328 (diff) | |
| parent | 3b8ab88acaceb505aa06ef3bbf3a73b92470ae78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/mac80211/sta_info.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e653a99ddc4c..e23cbd16f1bd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5812,6 +5812,13 @@ S: Maintained | |||
| 5812 | F: drivers/ssb/ | 5812 | F: drivers/ssb/ |
| 5813 | F: include/linux/ssb/ | 5813 | F: include/linux/ssb/ |
| 5814 | 5814 | ||
| 5815 | BROADCOM SPECIFIC AMBA DRIVER (BCMA) | ||
| 5816 | M: Rafał Miłecki <zajec5@gmail.com> | ||
| 5817 | L: linux-wireless@vger.kernel.org | ||
| 5818 | S: Maintained | ||
| 5819 | F: drivers/bcma/ | ||
| 5820 | F: include/linux/bcma/ | ||
| 5821 | |||
| 5815 | SONY VAIO CONTROL DEVICE DRIVER | 5822 | SONY VAIO CONTROL DEVICE DRIVER |
| 5816 | M: Mattia Dongili <malattia@linux.it> | 5823 | M: Mattia Dongili <malattia@linux.it> |
| 5817 | L: platform-driver-x86@vger.kernel.org | 5824 | L: platform-driver-x86@vger.kernel.org |