Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
17a7b16df4
linux/drivers/net/wireless
History
Aarthi Thiruvengadam 17a7b16df4 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>
2012-03-12 09:46:56 +02:00
..
ath ath6kl: Fix merge error in ath6kl_set_ies() 2012-03-12 09:46:56 +02:00
b43 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-02-01 10:48:50 -05:00
b43legacy Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-01-05 10:13:24 -05:00
brcm80211 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-02-29 14:53:21 -05:00
hostap hostap_cs: add ID for Canon K30225 2011-11-28 14:44:00 -05:00
ipw2x00 ipw2x00: remove ipw2100_rates_11b[] 2012-02-29 14:11:33 -05:00
iwlegacy iwlegacy: remove unused enum il4965_calib_enabled_state 2012-02-29 14:14:55 -05:00
iwlwifi Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-02-29 14:53:21 -05:00
iwmc3200wifi iwmc3200wifi: Fix typo in trace.h 2012-02-06 14:53:07 -05:00
libertas Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-01-08 12:19:57 -08:00
libertas_tf Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
mwifiex Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-02-29 14:53:21 -05:00
orinoco orinoco_usb: remove version definition 2012-01-24 15:03:04 -05:00
p54 mac80211: handle non-bufferable MMPDUs correctly 2012-02-29 14:14:54 -05:00
prism54 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2011-12-02 15:44:03 -05:00
rt2x00 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-02-29 14:53:21 -05:00
rtl818x USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
rtlwifi rtlwifi: Fix breakage in debug functions when built as a module 2012-02-27 14:05:45 -05:00
wl12xx wl12xx: remove some dead code in wl1271_plt_init() 2012-02-15 12:25:26 +02:00
wl1251 wl1251: enable sparse endianess check by default 2012-02-15 08:38:27 +02:00
zd1211rw zd1211rw: wait between setting hash table and powering radio on 2012-02-29 14:11:32 -05:00
adm8211.c
adm8211.h
airo_cs.c
airo.c airo: Fix array bounds warning when moving packet payload. 2011-11-26 15:35:10 -05:00
airo.h
at76c50x-usb.c
at76c50x-usb.h
atmel_cs.c
atmel_pci.c
atmel.c
atmel.h
Kconfig
mac80211_hwsim.c mac80211_hwsim: correctly line up a multiline printk 2012-02-27 14:06:43 -05:00
mac80211_hwsim.h
Makefile iwlegacy: rename remaining IWLs to ILs 2011-11-15 11:25:42 +01:00
mwl8k.c mwl8k: Remove BSSID from the firmware when the BSS is stopped 2012-02-06 14:55:42 -05:00
ray_cs.c ray_cs: Fix array bounds warnings. 2011-11-26 15:41:29 -05:00
ray_cs.h
rayctl.h ray_cs: Fix array bounds warnings. 2011-11-26 15:41:29 -05:00
rndis_wlan.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
wl3501_cs.c
wl3501.h
zd1201.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
zd1201.h