* Re: [PATCH] ath6kl: Fix merge error
[not found] <1331238302-4813-1-git-send-email-aarthi.thiruvengadam@qca.qualcomm.com>
@ 2012-03-12 8:00 ` Kalle Valo
0 siblings, 0 replies; only message in thread
From: Kalle Valo @ 2012-03-12 8:00 UTC (permalink / raw)
To: Aarthi Thiruvengadam; +Cc: ath6kl-devel, linux-wireless
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@qca.qualcomm.com>
Thanks for catching this! I have applied the patch but did some changes
to the commit log:
commit 17a7b16df4ba8e71e149fcf31e0b639ff45ddf84
Author: Aarthi Thiruvengadam <aarthi.thiruvengadam@qca.qualcomm.com>
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@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Kalle
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-12 8:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1331238302-4813-1-git-send-email-aarthi.thiruvengadam@qca.qualcomm.com>
2012-03-12 8:00 ` [PATCH] ath6kl: Fix merge error Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).