From: David S. Miller Date: Fri, 24 Aug 2012 19:15:04 +0000 (-0400) Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d05cebb9153e500648befaa6f135e6976bbfbd84;p=~shefty%2Frdma-dev.git Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless John W. Linville says: ==================== This batch of fixes is intended for 3.6... Johannes Berg gives us a pair of iwlwifi fixes. One corrects some improperly defined ifdefs that lead to crashes and BUG_ONs. The other prevents attempts to read SRAM for devices that aren't actually started. Julia Lawall provides an ipw2100 fix to properly set the return code from a function call before testing it! :-) Thomas Huehn corrects the improper use of a constant related to a power setting in ath5k. Thomas Pedersen offers a mac80211 fix to properly handle destination addresses of unicast frames passing though a mesh gate. Vladimir Zapolskiy provides a brcmsmac fix to properly mark the interface state when the device goes down. ==================== Signed-off-by: David S. Miller --- d05cebb9153e500648befaa6f135e6976bbfbd84