From: Aarthi Thiruvengadam <aarthi.thiruvengadam@qca.qualcomm.com>
Date: Thu, 8 Mar 2012 20:25:02 +0000 (-0800)
Subject: ath6kl: Fix merge error in ath6kl_set_ies()
X-Git-Tag: v3.4-rc1~177^2~48^2~55^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17a7b16df4ba8e71e149fcf31e0b639ff45ddf84;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed