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

Trivial merge