From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 8 Jun 2017 12:14:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'net-next/master' into mac80211-next
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a43e61842ec55baa486d60eed2a19af67ba78b9f;p=openwrt%2Fstaging%2Fblogic.git

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>
---

a43e61842ec55baa486d60eed2a19af67ba78b9f