q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/net/wireless
History
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
 		2011-11-21 13:50:33 -05:00
..
ath Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
b43 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
b43legacy Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
brcm80211 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
hostap drivers/net: Add moduleparam.h to drivers as required. 2011-10-31 19:31:09 -04:00
ipw2x00 wireless: move ieee80211chan2mhz macro 2011-11-11 12:32:50 -05:00
iwlegacy drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
iwlwifi Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
iwmc3200wifi Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
libertas Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
libertas_tf drivers/net: change moduleparam.h to module.h as required. 2011-10-31 19:31:08 -04:00
mwifiex Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
orinoco Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
p54 drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:08 -04:00
prism54
…
rt2x00 rt2x00: Fix sleep-while-atomic bug in powersaving code. 2011-11-15 10:02:56 -05:00
rtl818x drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
rtlwifi Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
wl12xx Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
wl1251 mac80211: pass vif param to conf_tx() callback 2011-10-03 15:22:41 -04:00
zd1211rw drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
Kconfig net: wireless: add brcm80211 drivers 2011-10-11 15:55:30 -04:00
Makefile wireless: cleanup brcm80211 bits in drivers/net/wireless/Makefile 2011-11-09 15:25:18 -05:00
adm8211.c drivers/net: Add module.h to drivers who were implicitly using it 2011-10-31 19:31:07 -04:00
adm8211.h
…
airo.c
…
airo.h
…
airo_cs.c
…
at76c50x-usb.c wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack 2011-10-31 17:30:57 -07:00
at76c50x-usb.h
…
atmel.c
…
atmel.h
…
atmel_cs.c
…
atmel_pci.c
…
mac80211_hwsim.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2011-11-17 13:11:43 -05:00
mac80211_hwsim.h
…
mwl8k.c mac80211: pass vif param to conf_tx() callback 2011-10-03 15:22:41 -04:00
ray_cs.c
…
ray_cs.h
…
rayctl.h
…
rndis_wlan.c rndis_wlan: release BSS structures returned by cfg80211_inform_bss() 2011-11-09 16:00:59 -05:00
wl3501.h
…
wl3501_cs.c wl3501_cs: min_t() cast truncates high bits 2011-09-27 14:36:04 -04:00
zd1201.c
…
zd1201.h
…