aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/ld-version.sh
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2015-01-22 07:49:44 -0500
committerKalle Valo <kvalo@codeaurora.org>2015-01-22 07:49:44 -0500
commit6b03e32d575917d048875a182bd2dd8924036000 (patch)
tree634b311d02423f2c1138e06be53d1842902bc28b /scripts/ld-version.sh
parentbc48a51c2a29e231256c2f96daf80c2b7a45f390 (diff)
parentc1e140bf79d817d4a7aa9932eb98b0359c87af33 (diff)
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
Diffstat (limited to 'scripts/ld-version.sh')
0 files changed, 0 insertions, 0 deletions