]> 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)
commit3e2d0d9a595bda3f253c412fa75d14f7b8577069
tree6c3c93f19e3933273b73b9edd16edc146ab18527
parent7983fb2769daa0746650197456900323864ae058
parent927460231e3454c53bda04f4ebba7d4a6f1670dc
Merge remote-tracking branch 'net-next/master' into mac80211-next

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