• Kalle Valo's avatar
    Merge commit 'c1e140bf' from mac80211-next · 6b03e32d
    Kalle Valo authored
    Patch "ath9k: Fix no-ack frame status" needs these mac80211 patches:
    
    commit 5cf16616
    Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
    Date:   Wed Dec 10 21:26:11 2014 +0530
    
        mac80211: Fix accounting of multicast frames
    
    commit 6b127c71
    Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
    Date:   Wed Dec 10 21:26:10 2014 +0530
    
        mac80211: Move IEEE80211_TX_CTL_PS_RESPONSE
    
    Conflicts:
    	drivers/net/wireless/ath/wil6210/cfg80211.c
    	drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
    6b03e32d
main.c 16.4 KB