Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Nov 2014 21:18:12 +0000 (16:18 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Nov 2014 21:18:12 +0000 (16:18 -0500)
commitbf515fb11ab539c76d04f0e3c5216ed41f41d81f
tree6aaa226c2a40f90a649561b4a5bb0d1772b20bf1
parent6bc6c49f1e2f3ab1bec05d1c08aad219ab4eb5d0
parentcf2c92d840c1424bcb3bb501147c79c9b067ad77
Merge tag 'mac80211-next-for-john-2014-11-04' of git://git./linux/kernel/git/jberg/mac80211-next

Johannes Berg <johannes@sipsolutions.net> says:

"This relatively large batch of changes is comprised of the
following:
 * large mac80211-hwsim changes from Ben, Jukka and a bit myself
 * OCB/WAVE/11p support from Rostislav on behalf of the Czech Technical
   University in Prague and Volkswagen Group Research
 * minstrel VHT work from Karl
 * more CSA work from Luca
 * WMM admission control support in mac80211 (myself)
 * various smaller fixes, spelling corrections, and minor API additions"

Conflicts:
drivers/net/wireless/ath/wil6210/cfg80211.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath10k/core.h
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/wil6210/cfg80211.c
drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/mwifiex/cfg80211.c