Merge tag 'mac80211-for-davem-2018-07-24' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 Jul 2018 16:38:50 +0000 (09:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Jul 2018 16:38:50 +0000 (09:38 -0700)
Johannes Berg says:

====================
Only a few fixes:
 * always keep regulatory user hint
 * add missing break statement in station flags parsing
 * fix non-linear SKBs in port-control-over-nl80211
 * reconfigure VLAN stations during HW restart
====================

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

Trivial merge