]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc74206d72822bc34891a2fb7a61c07629f3417d1
tree6c3c93f19e3933273b73b9edd16edc146ab18527
parent8071e4a9a8925d26b67b51f34cd0eef0145b1202
parent4d96c0ec869a1ca8b690a8eb755cbdc05b9562f1
Merge remote-tracking branch 'net-next/master' into mac80211-next

This brings in commit db07cc75ef38 ("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