Merge tag 'wireless-drivers-for-davem-2018-07-31' of git://git.kernel.org/pub/scm...
authorDavid S. Miller <davem@davemloft.net>
Tue, 31 Jul 2018 17:33:43 +0000 (10:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Jul 2018 17:33:43 +0000 (10:33 -0700)
commit92490695902b7d3e34e05d8b71d2daa8334c50e2
tree1b56f117e16bbf340e0e2ec13009b430eab034ba
parentc1d61e7fe3760851319138550efb732273ab2e57
parent299b6365a3b7cf7f5ea1c945a420e9ee4841d6f7
Merge tag 'wireless-drivers-for-davem-2018-07-31' of git://git./linux/kernel/git/kvalo/wireless-drivers

Kalle Valo says:

====================
wireless-drivers fixes for 4.18

Last set of fixes before 4.18 is released

iwlwifi

* add new IDs for cards already available on the market

brcmfmac

* fix a regression introduced in v4.17
====================

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