From: David S. Miller <davem@davemloft.net>
Date: Thu, 22 May 2014 19:24:26 +0000 (-0400)
Subject: Merge branch 'mac80211'
X-Git-Tag: v3.16-rc1~27^2~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beb584275bdb5633cbb4c6d1bfb424958ecebfea;p=thirdparty%2Fkernel%2Flinux.git

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>
---

beb584275bdb5633cbb4c6d1bfb424958ecebfea