From: David S. Miller Date: Thu, 10 Jul 2014 23:10:32 +0000 (-0700) Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... X-Git-Tag: v3.16-rc6~36^2~15 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f6864c6f3513ab44d4472a7a28b902468675d7a7;p=karo-tx-linux.git Merge branch 'for-davem' of git://git.kernel.org/pub/scm/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 --- f6864c6f3513ab44d4472a7a28b902468675d7a7