android_kernel_motorola_sm6225/drivers/net/wireless
David S. Miller b262e60309 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c
2008-10-01 06:12:56 -07:00
..
ath5k ath5k: Add support for AR2417 v2 2008-09-30 14:07:26 -04:00
ath9k Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-10-01 06:12:56 -07:00
b43 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-10-01 06:12:56 -07:00
b43legacy Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-10-01 06:12:56 -07:00
hostap netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep. 2008-07-22 14:16:42 -07:00
iwlwifi iwlwifi: use correct DMA_MASK 2008-09-30 14:07:22 -04:00
libertas libertas: Improvements on automatic tx power control via SIOCSIWTXPOW (fixups) 2008-09-30 14:07:23 -04:00
libertas_tf mac80211: use nl80211 interface types 2008-09-15 16:48:23 -04:00
p54 p54: Fix sparse warnings 2008-09-30 14:07:22 -04:00
prism54 wireless: replace __FUNCTION__ with __func__ 2008-08-22 16:29:56 -04:00
rt2x00 rt2x00: Fix build errors due to modularized rfkill or leds and built-in rt2x00. 2008-09-30 14:07:25 -04:00
zd1211rw Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-10-01 06:12:56 -07:00
adm8211.c mac80211: use nl80211 interface types 2008-09-15 16:48:23 -04:00
adm8211.h
airo.c wireless: Read scan flags correctly on x86-64 2008-09-24 16:17:58 -04:00
airo.h
airo_cs.c pcmcia: Fix up legacy driver IRQs 2008-09-24 16:18:04 -04:00
airport.c orinoco: Invoke firmware download in main driver 2008-08-22 19:28:05 -04:00
arlan-main.c
arlan-proc.c
arlan.h
atmel.c wireless: Read scan flags correctly on x86-64 2008-09-24 16:17:58 -04:00
atmel.h
atmel_cs.c pcmcia: Fix up legacy driver IRQs 2008-09-24 16:18:04 -04:00
atmel_pci.c
hermes.c orinoco: Add function to execute Hermes initialisation commands synchronously 2008-08-22 19:28:04 -04:00
hermes.h orinoco: Add MIC on TX and check on RX 2008-08-22 19:28:07 -04:00
hermes_dld.c orinoco: Extend hermes_dld routines for Agere firmware 2008-08-22 19:28:05 -04:00
hermes_dld.h orinoco: Extend hermes_dld routines for Agere firmware 2008-08-22 19:28:05 -04:00
hermes_rid.h orinoco: Add WE-18 ioctls for WPA 2008-08-22 19:28:06 -04:00
i82586.h
i82593.h
ipw2100.c wireless: replace __FUNCTION__ with __func__ 2008-08-22 16:29:56 -04:00
ipw2100.h
ipw2200.c removed unused #include <version.h> 2008-08-18 11:05:15 -04:00
ipw2200.h wireless: replace __FUNCTION__ with __func__ 2008-08-22 16:29:56 -04:00
Kconfig orinoco: Add MIC on TX and check on RX 2008-08-22 19:28:07 -04:00
mac80211_hwsim.c mac80211 hwsim: make radio list dynamic 2008-09-15 16:48:25 -04:00
Makefile orinoco: Move firmware download functionality into new module 2008-08-22 19:28:04 -04:00
netwave_cs.c pcmcia: Fix up legacy driver IRQs 2008-09-24 16:18:04 -04:00
orinoco.c wireless: Read scan flags correctly on x86-64 2008-09-24 16:17:58 -04:00
orinoco.h orinoco: Add MIC on TX and check on RX 2008-08-22 19:28:07 -04:00
orinoco_cs.c pcmcia: Fix up legacy driver IRQs 2008-09-24 16:18:04 -04:00
orinoco_nortel.c orinoco: Invoke firmware download in main driver 2008-08-22 19:28:05 -04:00
orinoco_pci.c orinoco: Invoke firmware download in main driver 2008-08-22 19:28:05 -04:00
orinoco_pci.h
orinoco_plx.c orinoco: Invoke firmware download in main driver 2008-08-22 19:28:05 -04:00
orinoco_tmd.c orinoco: Invoke firmware download in main driver 2008-08-22 19:28:05 -04:00
ray_cs.c pcmcia: Fix up legacy driver IRQs 2008-09-24 16:18:04 -04:00
ray_cs.h
rayctl.h
rndis_wlan.c wireless: Read scan flags correctly on x86-64 2008-09-24 16:17:58 -04:00
rtl818x.h rtl818x: merge tx/rx descriptor flags 2008-08-22 16:29:48 -04:00
rtl8180.h rtl818x: merge tx/rx descriptor flags 2008-08-22 16:29:48 -04:00
rtl8180_dev.c mac80211: use nl80211 interface types 2008-09-15 16:48:23 -04:00
rtl8180_grf5101.c
rtl8180_grf5101.h
rtl8180_max2820.c
rtl8180_max2820.h
rtl8180_rtl8225.c
rtl8180_rtl8225.h
rtl8180_sa2400.c
rtl8180_sa2400.h
rtl8187.h rtl818x: merge tx/rx descriptor flags 2008-08-22 16:29:48 -04:00
rtl8187_dev.c mac80211: use nl80211 interface types 2008-09-15 16:48:23 -04:00
rtl8187_rtl8225.c rtl8187: use different ANAPARAM*_OFF values for 8187B 2008-07-14 14:52:56 -04:00
rtl8187_rtl8225.h rtl8187: use different ANAPARAM*_OFF values for 8187B 2008-07-14 14:52:56 -04:00
spectrum_cs.c pcmcia: Fix up legacy driver IRQs 2008-09-24 16:18:04 -04:00
strip.c Fix strip driver back up for ldisc/tty changes 2008-07-20 17:12:38 -07:00
wavelan.c [netdrvr] Drivers should not set IFF_* flag themselves 2008-08-07 02:23:19 -04:00
wavelan.h
wavelan.p.h
wavelan_cs.c pcmcia: Fix up legacy driver IRQs 2008-09-24 16:18:04 -04:00
wavelan_cs.h
wavelan_cs.p.h
wl3501.h
wl3501_cs.c pcmcia: Fix up legacy driver IRQs 2008-09-24 16:18:04 -04:00
zd1201.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2008-07-18 02:39:39 -07:00
zd1201.h