tree 78568cd9732fbb70b1206fcaeb6f90220752ef9f
parent f55aa836fb7a90b62cb2c533b899e331cdffcf0c
parent 5746cc2a6923b4e4726d9be8aa155461829be360
author David S. Miller <davem@davemloft.net> 1390597433 -0800
committer David S. Miller <davem@davemloft.net> 1390597433 -0800

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says:

====================
Please pull these fixes for the 3.14 stream!

For the iwlwifi fix, Emmanuel says:

"A critical bug has been reported on all NICs supported by iwldvm.
iwlwifi would simply panic upon interface up This patch fixes this. The
offending code is by me and is present in wireless-next.git and hence in
net-next.git."

Along with that...

Andreas Fenkart corrects a WoWLAN problem with mwifiex.

Roman Dubtsov adds a device ID to rt2800usb.

Sujith Manoharan re-enables a mistakenly commented-out line of code in
ath9k, and also fixes and interrupt mitigation issue for that driver.

ZHAO Gang fixes an incorrect assignment (reverse/wrong API call) in b43.

Please let me know if there are problems!
====================

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