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)
commitaaef66b837104e1b2901215de3f68fce9e60acc7
tree11c52d3fda102c77e82a97c1b35ff185560af997
parentf7d855566ff69207be1052ceecbf455f89490b42
parent20658702e08ecd693236b443837d28863b93e872
Merge tag 'mac80211-for-davem-2015-01-15' of git://git./linux/kernel/git/jberg/mac80211

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>