From: David S. Miller Date: Thu, 4 Jun 2015 06:44:57 +0000 (-0700) Subject: Merge tag 'wireless-drivers-next-for-davem-2015-06-03' of git://git.kernel.org/pub... X-Git-Tag: omap-for-v4.2/fixes-rc1^2~134^2~139 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d1dabfbd0760269475a0cbbcc568505aa3ada60;p=pandora-kernel.git Merge tag 'wireless-drivers-next-for-davem-2015-06-03' of git://git./linux/kernel/git/kvalo/wireless-drivers-next Kalle Valo says: ==================== new driver mt7601u for MediaTek Wi-Fi devices MT7601U ath10k: * qca6174 power consumption improvements, enable ASPM etc (Michal) wil6210: * support Wi-Fi Simple Configuration in STA mode iwlwifi: * a few fixes (re-enablement of interrupts for certain new platforms that have special power states) * Rework completely the RBD allocation model towards new multi RX hardware. * cleanups * scan reworks continuation (Luca) mwifiex: * improve firmware debug functionality rtlwifi: * update regulatory database brcmfmac: * cleanup and new feature support in PCIe code * alternative nvram loading for router support ==================== Conflicts: drivers/net/wireless/iwlwifi/Kconfig Trivial conflict in iwlwifi Kconfig, two commits adding the same two chip numbers to the help text, but order transposed. Signed-off-by: David S. Miller --- 9d1dabfbd0760269475a0cbbcc568505aa3ada60 Reading git-diff-tree failed