From: David S. Miller <davem@davemloft.net> Date: Wed, 21 Aug 2013 00:25:55 +0000 (-0700) Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5c751c9344fce32cebc1c53514644e625a484916;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless John W. Linville says: ==================== Regarding the iwlwifi bits, Johannes says: "We revert an rfkill bugfix that unfortunately caused more bugs, shuffle some code to avoid touching the PCIe device before it's enabled and disconnect if firmware fails to do our bidding. I also have Stanislaw's fix to not crash in some channel switch scenarios." As for the mac80211 bits, Johannes says: "This time, I have one fix from Dan Carpenter for users of nl80211hdr_put(), and one fix from myself fixing a regression with the libertas driver." Along with the above... Dan Carpenter fixes some incorrectly placed "address of" operators in hostap that caused copying of junk data. Jussi Kivilinna corrects zd1201 to use an allocated buffer rather than the stack for a URB operation. ==================== Signed-off-by: David S. Miller <davem@davemloft.net> --- 5c751c9344fce32cebc1c53514644e625a484916