John W. Linville 3480a58a90 rt2x00: fixup some non-functional merge errors ... These small changes restore the rt2x00 sources to the way Ivo intended. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2008-04-01 17:13:17 -04:00
..
ath5k	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-03-18 00:37:55 -07:00
b43	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-03-27 18:48:56 -07:00
b43legacy	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-03-05 12:26:41 -08:00
hostap	Add another Prism2 card to hostap	2008-01-31 19:26:51 -08:00
iwlwifi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-03-27 18:48:56 -07:00
libertas	libertas: don't depend on IEEE80211	2008-04-01 17:13:17 -04:00
prism54	prism54: correct thinko in "prism54: Convert stats_sem in a mutex"	2008-03-27 16:03:22 -04:00
rt2x00	rt2x00: fixup some non-functional merge errors	2008-04-01 17:13:17 -04:00
zd1211rw	zd1211rw: support for mesh interface and beaconing	2008-03-06 17:19:47 -05:00
adm8211.c	adm8211: fix cfg80211 band API conversion	2008-02-29 15:41:48 -05:00
adm8211.h	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
airo_cs.c
airo.c	airo: last of endianness annotations	2008-01-28 15:09:05 -08:00
airo.h
airport.c
arlan-main.c
arlan-proc.c	arlan: fix warning when PROC_FS=n	2008-03-24 19:25:08 -04:00
arlan.h
atmel_cs.c
atmel_pci.c
atmel.c	drivers/net/wireless/atmel.c: Use time_* macros	2008-02-29 15:37:11 -05:00
atmel.h
hermes_rid.h
hermes.c
hermes.h
i82586.h
i82593.h
ipw2100.c	latency.c: use QoS infrastructure	2008-02-05 09:44:22 -08:00
ipw2100.h
ipw2200.c	ipw2200 annotations and fixes	2008-03-25 16:41:58 -04:00
ipw2200.h	ipw2200 annotations and fixes	2008-03-25 16:41:58 -04:00
Kconfig	libertas: don't depend on IEEE80211	2008-04-01 17:13:17 -04:00
Makefile	the scheduled bcm43xx removal	2008-03-13 16:01:04 -04:00
net2280.h
netwave_cs.c	pcmcia: replace kio_addr_t with unsigned int everywhere	2008-02-05 09:44:08 -08:00
orinoco_cs.c
orinoco_nortel.c
orinoco_pci.c
orinoco_pci.h
orinoco_plx.c
orinoco_tmd.c
orinoco.c	orinoco: always use latest BSS info when caching scan results	2008-01-28 15:05:55 -08:00
orinoco.h	orinoco: more reliable scan handling	2008-01-28 15:03:32 -08:00
p54.h	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
p54common.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-03-05 12:26:41 -08:00
p54common.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-03-05 12:26:41 -08:00
p54pci.c	p54pci: endianness annotations and fixes	2008-01-28 15:09:07 -08:00
p54pci.h	p54pci: endianness annotations and fixes	2008-01-28 15:09:07 -08:00
p54usb.c	prism54: support for 124a:4025 - another version of IOGear GWU513 802.11g	2008-03-13 15:57:22 -04:00
p54usb.h
ray_cs.c	misc wireless annotations	2008-01-28 15:09:11 -08:00
ray_cs.h
rayctl.h
rndis_wlan.c	rndis_wlan: cleanup, rename structure members	2008-03-13 16:02:33 -04:00
rtl818x.h	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180_dev.c	endianness annotations: drivers/net/wireless/rtl8180_dev.c	2008-04-01 17:13:16 -04:00
rtl8180_grf5101.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180_grf5101.h	Add rtl8180 wireless driver	2008-01-28 15:09:35 -08:00
rtl8180_max2820.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180_max2820.h	Add rtl8180 wireless driver	2008-01-28 15:09:35 -08:00
rtl8180_rtl8225.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180_rtl8225.h	Add rtl8180 wireless driver	2008-01-28 15:09:35 -08:00
rtl8180_sa2400.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8180_sa2400.h	Add rtl8180 wireless driver	2008-01-28 15:09:35 -08:00
rtl8180.h	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8187_dev.c	rtl818x: fix RTS/CTS-less transmit	2008-02-29 15:37:12 -05:00
rtl8187_rtl8225.c	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
rtl8187_rtl8225.h	Add rtl8180 wireless driver	2008-01-28 15:09:35 -08:00
rtl8187.h	cfg80211 API for channels/bitrates, mac80211 and driver conversion	2008-02-29 15:19:32 -05:00
spectrum_cs.c
strip.c	wireless: Convert to list_for_each_entry_rcu()	2008-02-29 15:37:25 -05:00
wavelan_cs.c	pcmcia: replace kio_addr_t with unsigned int everywhere	2008-02-05 09:44:08 -08:00
wavelan_cs.h	wavelan_cs arm fix	2008-03-24 19:25:07 -04:00
wavelan_cs.p.h	WAVELAN - compile-time check for struct sizes	2008-01-28 15:09:50 -08:00
wavelan.c	WAVELAN - compile-time check for struct sizes	2008-01-28 15:09:50 -08:00
wavelan.h	wavelan: mark hardware interfacing structures as packed	2008-02-15 13:44:17 -05:00
wavelan.p.h	WAVELAN - compile-time check for struct sizes	2008-01-28 15:09:50 -08:00
wl3501_cs.c
wl3501.h
zd1201.c
zd1201.h