Merge branch 'mac80211'
authorDavid S. Miller <davem@davemloft.net>
Thu, 22 May 2014 19:24:26 +0000 (15:24 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 May 2014 19:24:26 +0000 (15:24 -0400)
commitbeb584275bdb5633cbb4c6d1bfb424958ecebfea
tree102a05e3d4e325e8551a342c6a8b587571d29adf
parent68bc74feb0ce1cc79cb2b5bbdfc592f30f37dab8
parent62e9c117eec56a3c9611613a3aa90c9671244d33
Merge branch 'mac80211'

Phoebe Buckheister says:

====================
mac802154: llsec oversights

Fixes an unlock operation not matching a previous lock operation in an
unlikely error path and removes a redundant check.
====================

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