diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2013-06-04 12:56:01 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-04 13:02:42 +0200 |
| commit | 51217cee3a94d5409d6ee2ac090ae96bc9a06757 (patch) | |
| tree | 373c5ebf9e87ef81feb1d02feaf06f673fcf9a13 /net/mac80211/mlme.c | |
| parent | mac80211: set IEEE80211_TX_CTL_REQ_TX_STATUS on nullframes (diff) | |
| parent | brcmsmac: Reduce log spam in heavy tx, make err print in debug (diff) | |
| download | linux-dev-51217cee3a94d5409d6ee2ac090ae96bc9a06757.tar.xz linux-dev-51217cee3a94d5409d6ee2ac090ae96bc9a06757.zip | |
Merge remote-tracking branch 'wireless-next/master' into HEAD
Merge to get the wil6210 changes that a cfg80211 change needs.
A conflict in drivers/net/wireless/ath/ath9k/init.c was just
whitespace changes.
Also fix a semantic conflict due to cw1200 using WoWLAN which
I had modified in my tree.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
0 files changed, 0 insertions, 0 deletions