Searched hist:"17 a7b16d" (Results 1 – 1 of 1) sorted by relevance
| /openbmc/linux/drivers/net/wireless/ath/ath6kl/ |
| H A D | cfg80211.c | 17a7b16d Thu Mar 08 14:25:02 CST 2012 Aarthi Thiruvengadam <aarthi.thiruvengadam@qca.qualcomm.com> ath6kl: Fix merge error in ath6kl_set_ies()
Portion of the commit id 080eec4fb4 ("ath6kl: Clear the IE in firmware
if not set") was overwritten by mistake due to a merge
conflict. This patch fixes the code back to how it should be.
kvalo: more details to the commit log
Signed-off-by: Aarthi Thiruvengadam <athiruve@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
17a7b16d Thu Mar 08 14:25:02 CST 2012 Aarthi Thiruvengadam <aarthi.thiruvengadam@qca.qualcomm.com> ath6kl: Fix merge error in ath6kl_set_ies()
Portion of the commit id 080eec4fb4 ("ath6kl: Clear the IE in firmware
if not set") was overwritten by mistake due to a merge
conflict. This patch fixes the code back to how it should be.
kvalo: more details to the commit log
Signed-off-by: Aarthi Thiruvengadam <athiruve@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
|