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)
commita43e61842ec55baa486d60eed2a19af67ba78b9f
tree6c3c93f19e3933273b73b9edd16edc146ab18527
parent5d473fedd17ae3a9f92fb35551e307d01459ea6a
parent50dffe7fad6c156c2928e45c19ff7b86eb951f4c
Merge remote-tracking branch 'net-next/master' into mac80211-next

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>
include/linux/skbuff.h
net/mac80211/ieee80211_i.h
net/mac80211/sta_info.c
net/mac80211/sta_info.h
net/wireless/util.c