From: David S. Miller Date: Thu, 3 Oct 2013 20:28:18 +0000 (-0400) Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... X-Git-Tag: MMI-PSA29.97-13-9~13424^2~71 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7df9b48588cb3970b564a471b2f7a018c1706e8d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'for-davem' of git://git./linux/kernel/git/linville/wireless John W. Linville says: ==================== Here is another batch of fixes intended for the 3.12 stream... For the mac80211 bits, Johannes says: "This time I have two fixes for IBSS (including one for wext, hah), a fix for extended rates IEs, an active monitor checking fix and a sysfs registration race fix." On top of those... Amitkumar Karwar brings an mwifiex fix for an interrupt loss issue w/ SDIO devices. The problem was due to a command timeout issue introduced by an earlier patch. Felix Fietkau a stall in the ath9k driver. This patch fixes the regression introduced in the commit "ath9k: use software queues for un-aggregated data packets". Stanislaw Gruszka reverts an rt2x00 patch that was found to cause connection problems with some devices. ==================== Signed-off-by: David S. Miller --- 7df9b48588cb3970b564a471b2f7a018c1706e8d