git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b51f92e)
ath6kl: Fix merge error in ath6kl_set_ies()
authorAarthi Thiruvengadam <aarthi.thiruvengadam@qca.qualcomm.com>
Thu, 8 Mar 2012 20:25:02 +0000 (12:25 -0800)
committerKalle Valo <kvalo@qca.qualcomm.com>
Mon, 12 Mar 2012 07:46:56 +0000 (09:46 +0200)
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>

No differences found
Pandora Kernel Repository