David S. Miller 5b9ab2ec04 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/hp-plus.c drivers/net/wireless/ath5k/base.c drivers/net/wireless/ath9k/recv.c net/wireless/reg.c		2008-11-26 23:48:40 -08:00
..
ath5k	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-26 23:48:40 -08:00
ath9k	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-26 23:48:40 -08:00
b43	b43: remove rate index warning	2008-11-21 11:06:07 -05:00
b43legacy	b43legacy: implement short slot and basic rate handling	2008-11-21 11:06:06 -05:00
hostap	lib80211: consolidate crypt init routines	2008-11-21 11:08:17 -05:00
ipw2x00	net/ieee80211 -> drivers/net/ipw2x00/libipw_* rename	2008-11-21 11:08:18 -05:00
iwlwifi	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-26 23:48:40 -08:00
libertas
libertas_tf
orinoco	orinoco: Provide option to avoid unnecessary fw caching	2008-11-26 09:47:47 -05:00
p54	p54: fix wmm queue settings	2008-11-26 09:47:50 -05:00
prism54
rt2x00	rt2x00: Don't switch off LED on initialization	2008-11-26 09:47:19 -05:00
rtl818x	rtl8187: Fix transmission count sent to mac80211	2008-11-26 09:47:20 -05:00
zd1211rw
adm8211.c
adm8211.h
airo_cs.c
airo.c
airo.h
arlan-main.c
arlan-proc.c
arlan.h
atmel_cs.c
atmel_pci.c
atmel.c
atmel.h
i82586.h
i82593.h
Kconfig	orinoco: Provide option to avoid unnecessary fw caching	2008-11-26 09:47:47 -05:00
mac80211_hwsim.c	mac80211_hwsim: fix-up some print_mac merge damage	2008-11-26 09:47:52 -05:00
Makefile	ipw2x00: relocate ipw2100/ipw2200 to common directory	2008-11-21 11:08:17 -05:00
netwave_cs.c
ray_cs.c
ray_cs.h
rayctl.h
rndis_wlan.c
strip.c
wavelan_cs.c
wavelan_cs.h
wavelan_cs.p.h
wavelan.c
wavelan.h
wavelan.p.h
wl3501_cs.c
wl3501.h
zd1201.c
zd1201.h