| commit | a43e61842ec55baa486d60eed2a19af67ba78b9f | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Thu Jun 08 14:14:40 2017 +0200 |
| committer | Johannes Berg <johannes.berg@intel.com> | Thu Jun 08 14:14:45 2017 +0200 |
| tree | 6c3c93f19e3933273b73b9edd16edc146ab18527 | |
| parent | 5d473fedd17ae3a9f92fb35551e307d01459ea6a [diff] | |
| parent | 50dffe7fad6c156c2928e45c19ff7b86eb951f4c [diff] |
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>