Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Thu, 10 Jul 2014 23:10:32 +0000 (16:10 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Jul 2014 23:10:32 +0000 (16:10 -0700)
commitf6864c6f3513ab44d4472a7a28b902468675d7a7
tree3352c6f386aa51e1341c53583065d9e46e2fc15f
parent76252723e88681628a3dbb9c09c963e095476f73
parentd672f939bc81513d28a5bfc570ed2f17d8f5b34a
Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless

John W. Linville says:

====================
pull request: wireless 2014-07-10

Please pull this batch of fixes intended for the 3.16 stream!

For the iwlwifi bits, Emmanuel says:

"I have here 2 patches that disable the usage of CTS to self. This
keeps making trouble to the firmware and is not a really reliable
protection anyway. We may re-enable it in the future, but in rarer
cases. Along with this, I have a fix from Ilan that prevents a
firmware assertion."

On top of that...

Amitkumar Karwar provides an mwifiex fix to properly initialize
(i.e. zero) tx_info/rx_info.

Andrea Merello stops rt2800usb from doing DMA operations on the
stack...yikes!
====================

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