]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'wireless-drivers-for-davem-2017-06-20' of git://git.kernel.org/pub/scm...
authorDavid S. Miller <davem@davemloft.net>
Tue, 20 Jun 2017 19:41:56 +0000 (15:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Jun 2017 19:41:56 +0000 (15:41 -0400)
Kalle Valo says:

====================
wireless-drivers fixes for 4.12

Two important fixes for brcmfmac. The rest of the brcmfmac patches are
either code preparation and fixing a new build warning.

brcmfmac

* fix a NULL pointer dereference during resume

* fix a NULL pointer dereference with USB devices, a regression from
  v4.12-rc1
====================

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

Trivial merge