Merge tag 'wireless-drivers-next-for-davem-2016-07-22' of git://git.kernel.org/pub...
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 Jul 2016 18:09:19 +0000 (11:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Jul 2016 18:09:19 +0000 (11:09 -0700)
commitd5b160d3422f668c0c46092889f9cd935be531e9
tree4a375bbaf18c76862e6871a30261fd7f13025c1f
parent15657841bd5bb23dac7120c4e2e181b390a5ec12
parentcb6a115188500a448709df1f2d7698a4e1b7a099
Merge tag 'wireless-drivers-next-for-davem-2016-07-22' of git://git./linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
pull-request: wireless-drivers-next 2016-07-22

I'm sick so I have to keep this short, but here's the last pull request
to net-next. This time there's a trivial conflict with mtd tree:

http://lkml.kernel.org/g/20160720123133.44dab209@canb.auug.org.au

We concluded with Brian (CCed) that it's best that we ask Linus to fix
this. The patches have been in linux-next for a couple of days. This
time I haven't done any merge tests so I don't know if there are any
other conflicts etc.

Please let me know if there are any problems.

wireless-drivers-next patches for 4.8

Major changes:

wl18xx

* add initial mesh support

bcma

* serial flash support on non-MIPS SoCs

ath10k

* enable support for QCA9888
* disable wake_tx_queue() mac80211 op for older devices to workaround
  throughput regression

ath9k

* implement temperature compensation support for AR9003+
====================

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