diff options
| author | Aarthi Thiruvengadam <aarthi.thiruvengadam@qca.qualcomm.com> | 2012-03-08 15:25:02 -0500 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-03-12 03:46:56 -0400 |
| commit | 17a7b16df4ba8e71e149fcf31e0b639ff45ddf84 (patch) | |
| tree | 8ad77d9a7f26c779485af2b56a9c263d27b8d7d6 /mm | |
| parent | b51f92e09ab63f49bb32769cc3a7d0d49ffefcdf (diff) | |
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>
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions