On 03/08/2012 10:25 PM, Aarthi Thiruvengadam wrote:
> Portion of the commit id 080eec4fb4 was overwritten by mistake due to a merge
> conflict. This patch fixes the code back to how it should be.
>
> Signed-off-by: Aarthi Thiruvengadam <athiruve@xxxxxxxxxxxxxxxx>
Thanks for catching this! I have applied the patch but did some changes
to the commit log:
commit 17a7b16df4ba8e71e149fcf31e0b639ff45ddf84
Author: Aarthi Thiruvengadam <aarthi.thiruvengadam@xxxxxxxxxxxxxxxx>
Date: Thu Mar 8 12:25:02 2012 -0800
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@xxxxxxxxxxxxxxxx>
Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxxxx>
Kalle
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
