Merge tag 'mac80211-for-davem-2015-01-15' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Jan 2015 00:28:36 +0000 (19:28 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Jan 2015 00:28:36 +0000 (19:28 -0500)
Just two fixes - one for an uninialized variable and
one for a deadlock in regulatory processing.

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

Trivial merge