linux_old1/drivers/net/wireless
David S. Miller d5ef8a4d87 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/infiniband/hw/nes/nes_cm.c

Simple whitespace conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-02-10 23:32:28 -05:00
..
ath Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-10 23:32:28 -05:00
b43 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-02-06 14:26:39 -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-next into for-davem 2012-02-06 14:26:39 -05:00
hostap drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
ipw2x00 drivers/net: Remove alloc_etherdev error messages 2012-01-31 16:20:48 -05:00
iwlegacy iwlegacy: 3945: fix hw passive scan on radar channels 2012-01-04 14:30:45 -05:00
iwlwifi Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-02-06 14:26:39 -05:00
iwmc3200wifi module_param: make bool parameters really bool (net & drivers/net) 2011-12-19 22:27:29 -05:00
libertas drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
libertas_tf drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
mwifiex Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-10 23:32:28 -05:00
orinoco Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-02-06 14:26:39 -05:00
p54 mac80211: make beacon filtering per virtual interface 2012-01-27 14:56:53 -05:00
prism54 drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
rt2x00 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-02-06 14:26:39 -05:00
rtl818x USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
rtlwifi Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-02-06 14:26:39 -05:00
wl12xx mac80211: make CQM RSSI support per virtual interface 2012-01-27 14:56:54 -05:00
wl1251 mac80211: make CQM RSSI support per virtual interface 2012-01-27 14:56:54 -05:00
zd1211rw zd1211rw: firmware needs duration_id set to zero for non-pspoll frames 2012-02-07 14:43:15 -05:00
Kconfig net: wireless: add brcm80211 drivers 2011-10-11 15:55:30 -04:00
Makefile iwlegacy: rename remaining IWLs to ILs 2011-11-15 11:25:42 +01: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: Fix array bounds warning when moving packet payload. 2011-11-26 15:35:10 -05:00
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 drivers/net: Remove alloc_etherdev error messages 2012-01-31 16:20:48 -05:00
atmel.h
atmel_cs.c
atmel_pci.c
mac80211_hwsim.c net: fix assignment of 0/1 to bool variables. 2011-12-19 22:27:29 -05:00
mac80211_hwsim.h
mwl8k.c mwl8k: Configuring correct MAC address in broadcast key 2012-01-27 14:57:07 -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.h
wl3501_cs.c wl3501_cs: min_t() cast truncates high bits 2011-09-27 14:36:04 -04:00
zd1201.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
zd1201.h