From: Kalle Valo <kvalo@codeaurora.org>
Date: Thu, 22 Jan 2015 12:49:44 +0000 (+0200)
Subject: Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next
X-Git-Tag: fixes-v4.0-rc1~150^2~130^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b03e32d575917d048875a182bd2dd8924036000;p=pandora-kernel.git

Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next

Patch "ath9k: Fix no-ack frame status" needs these mac80211 patches:

commit 5cf16616e152dd5c274a65954c77f64892d025a8
Author: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Date:   Wed Dec 10 21:26:11 2014 +0530

    mac80211: Fix accounting of multicast frames

commit 6b127c71fbdd3daacfd8b9f80b8e6ebfb70a889e
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
---

6b03e32d575917d048875a182bd2dd8924036000
Reading git-diff-tree failed