Merge tag 'mac80211-for-davem-2017-11-20' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Nov 2017 11:30:57 +0000 (20:30 +0900)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Nov 2017 11:30:57 +0000 (20:30 +0900)
commita13e8d418f3cb9d0b4efa6e744b8b23c0e3cdfe8
treea294d1434ebca50330b797803b22749f91866ab7
parentb48b1f7ac716e3f0474f8b94bc471c6e47b2f57a
parent33ddd81e2bd5d9970b9f01ab383ba45035fa41ee
Merge tag 'mac80211-for-davem-2017-11-20' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
A few things:
 * straggler timer conversions from Kees
 * memory leak fix in hwsim
 * fix some fallout from regdb changes if wireless is built-in
 * also free aggregation sessions in startup state when station
   goes away, to avoid crashing the timer
====================

Signed-off-by: David S. Miller <davem@davemloft.net>