Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-09-14 13:53:49 -04:00
parent 7f2e6a5d86 7a5f799bec
commit 9316f0e3c6
130 changed files with 3662 additions and 916 deletions
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -245,6 +245,7 @@ struct ieee80211_sta_vht_cap {
 *	rates" IE, i.e. CCK rates first, then OFDM.
 * @n_bitrates: Number of bitrates in @bitrates
 * @ht_cap: HT capabilities in this band
+ * @vht_cap: VHT capabilities in this band
 */
 struct ieee80211_supported_band {
 	struct ieee80211_channel *channels;