Merge tag 'wireless-drivers-for-davem-2017-07-28' of git://git.kernel.org/pub/scm...
authorDavid S. Miller <davem@davemloft.net>
Sat, 29 Jul 2017 22:30:08 +0000 (15:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 29 Jul 2017 22:30:08 +0000 (15:30 -0700)
Kalle Valo says:

====================
wireless-drivers fixes for 4.13

Two fixes for for brcmfmac, the crash was reported by two people
already so it's a high priority fix.

brcmfmac

* fix a crash in skb headroom handling in v4.13-rc1
* fix a memory leak due to a merge error in v4.6
====================

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

Trivial merge