diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:09:59 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:11:13 -0400 |
| commit | a59f975a78f0606a3a364939dfa9b949d5f87521 (patch) | |
| tree | 42ef7708cdec5263026a5e1e84d960d6ba20844f /MAINTAINERS | |
| parent | 7f0d9f430dc99303558adc30a75eef10c43f7bec (diff) | |
| parent | 6aee4ca3d2217d3f76469e5ed576d62695f0912a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
MAINTAINERS
drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c5fd905206e7..3075a2a29511 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1800,6 +1800,9 @@ F: include/linux/cfag12864b.h | |||
| 1800 | CFG80211 and NL80211 | 1800 | CFG80211 and NL80211 |
| 1801 | M: Johannes Berg <johannes@sipsolutions.net> | 1801 | M: Johannes Berg <johannes@sipsolutions.net> |
| 1802 | L: linux-wireless@vger.kernel.org | 1802 | L: linux-wireless@vger.kernel.org |
| 1803 | W: http://wireless.kernel.org/ | ||
| 1804 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git | ||
| 1805 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git | ||
| 1803 | S: Maintained | 1806 | S: Maintained |
| 1804 | F: include/linux/nl80211.h | 1807 | F: include/linux/nl80211.h |
| 1805 | F: include/net/cfg80211.h | 1808 | F: include/net/cfg80211.h |
| @@ -4340,7 +4343,8 @@ MAC80211 | |||
| 4340 | M: Johannes Berg <johannes@sipsolutions.net> | 4343 | M: Johannes Berg <johannes@sipsolutions.net> |
| 4341 | L: linux-wireless@vger.kernel.org | 4344 | L: linux-wireless@vger.kernel.org |
| 4342 | W: http://wireless.kernel.org/ | 4345 | W: http://wireless.kernel.org/ |
| 4343 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git | 4346 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git |
| 4347 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git | ||
| 4344 | S: Maintained | 4348 | S: Maintained |
| 4345 | F: Documentation/networking/mac80211-injection.txt | 4349 | F: Documentation/networking/mac80211-injection.txt |
| 4346 | F: include/net/mac80211.h | 4350 | F: include/net/mac80211.h |
| @@ -4351,7 +4355,8 @@ M: Stefano Brivio <stefano.brivio@polimi.it> | |||
| 4351 | M: Mattias Nissler <mattias.nissler@gmx.de> | 4355 | M: Mattias Nissler <mattias.nissler@gmx.de> |
| 4352 | L: linux-wireless@vger.kernel.org | 4356 | L: linux-wireless@vger.kernel.org |
| 4353 | W: http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID | 4357 | W: http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID |
| 4354 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git | 4358 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git |
| 4359 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git | ||
| 4355 | S: Maintained | 4360 | S: Maintained |
| 4356 | F: net/mac80211/rc80211_pid* | 4361 | F: net/mac80211/rc80211_pid* |
| 4357 | 4362 | ||
| @@ -5695,6 +5700,9 @@ F: include/linux/remoteproc.h | |||
| 5695 | RFKILL | 5700 | RFKILL |
| 5696 | M: Johannes Berg <johannes@sipsolutions.net> | 5701 | M: Johannes Berg <johannes@sipsolutions.net> |
| 5697 | L: linux-wireless@vger.kernel.org | 5702 | L: linux-wireless@vger.kernel.org |
| 5703 | W: http://wireless.kernel.org/ | ||
| 5704 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git | ||
| 5705 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git | ||
| 5698 | S: Maintained | 5706 | S: Maintained |
| 5699 | F: Documentation/rfkill.txt | 5707 | F: Documentation/rfkill.txt |
| 5700 | F: net/rfkill/ | 5708 | F: net/rfkill/ |