Merge tag 'mac80211-for-davem-2016-07-06' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Sat, 9 Jul 2016 03:53:41 +0000 (23:53 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 Jul 2016 03:53:41 +0000 (23:53 -0400)
commit5b58d8361764fc627e19aef1319f5ac7a0d7bf6f
tree25fc97a6d271ed4da840499d6954f92b58d09049
parent92f7d07d68c1dfcbb80b3259f29dad8efe890803
parent16a910a6722b7a8680409e634c7c0dac073c01e4
Merge tag 'mac80211-for-davem-2016-07-06' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Two more fixes:
 * handle allocation failures in new(ish) A-MSDU decapsulation
 * don't leak memory on nl80211 ACL parse errors
====================

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