Merge tag 'mac80211-for-davem-2017-03-31' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Sat, 1 Apr 2017 20:31:15 +0000 (13:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 1 Apr 2017 20:31:15 +0000 (13:31 -0700)
Johannes Berg says:

====================
Two fixes:
 * don't block netdev queues (indefinitely!) if mac80211
   manages traffic queueing itself
 * check wiphy registration before checking for ops
   on resume, to avoid crash
====================

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

Trivial merge