Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Thu, 8 Jun 2017 12:14:40 +0000 (14:14 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 8 Jun 2017 12:14:45 +0000 (14:14 +0200)
This brings in commit 7a7c0a6438b8 ("mac80211: fix TX aggregation
start/stop callback race") to allow the follow-up cleanup.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1  2 
include/linux/skbuff.h
net/mac80211/ieee80211_i.h
net/mac80211/sta_info.c
net/mac80211/sta_info.h
net/wireless/util.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge