OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
68bc74f
62e9c11
)
Merge branch 'mac80211'
author
David S. Miller
<davem@davemloft.net>
Thu, 22 May 2014 19:24:26 +0000
(15:24 -0400)
committer
David S. Miller
<davem@davemloft.net>
Thu, 22 May 2014 19:24:26 +0000
(15:24 -0400)
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>
Trivial merge