linux/drivers/net/wireless
John W. Linville 7eab0f64a9 Merge branch 'master' into for-davem
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	net/wireless/nl80211.c
2012-04-12 14:41:59 -04:00
..
ath Merge branch 'master' into for-davem 2012-04-12 14:41:59 -04:00
b43 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-04-12 13:49:28 -04:00
b43legacy Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-04-12 13:49:28 -04:00
brcm80211 wireless: Remove unnecessary ; from while (0) macros 2012-04-11 16:23:56 -04:00
hostap Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07:00
ipw2x00 Merge branch 'master' into for-davem 2012-04-12 14:41:59 -04:00
iwlegacy Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-04-12 13:49:28 -04:00
iwlwifi Merge branch 'master' into for-davem 2012-04-12 14:41:59 -04:00
iwmc3200wifi simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
libertas simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07: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/linville/wireless 2012-04-12 13:49:28 -04:00
orinoco net: orinoco: add error handling for failed kmalloc(). 2012-03-28 14:25:35 -04:00
p54 mac80211: remove antenna_sel_tx TX info field 2012-04-10 14:54:09 -04:00
prism54 Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
rt2x00 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-04-12 13:49:28 -04:00
rtl818x rtl8187: Add AD-HOC support 2012-03-07 13:56:37 -05:00
rtlwifi Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2012-04-12 13:49:28 -04:00
wl12xx Merge branch 'master' into for-davem 2012-04-12 14:41:59 -04:00
wl1251 simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
zd1211rw Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-03-20 21:12:50 -07: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_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
airo.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
airo.h
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_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
atmel_pci.c
atmel.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
atmel.h
Kconfig
mac80211_hwsim.c Merge branch 'master' into for-davem 2012-04-12 14:41:59 -04:00
mac80211_hwsim.h
Makefile iwlegacy: rename remaining IWLs to ILs 2011-11-15 11:25:42 +01:00
mwl8k.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-02-21 15:06:35 -05:00
ray_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
ray_cs.h
rayctl.h ray_cs: Fix array bounds warnings. 2011-11-26 15:41:29 -05:00
rndis_wlan.c rndis_wlan: use u8 for key indexes 2012-03-05 15:23:17 -05:00
wl3501_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
wl3501.h
zd1201.c USB: convert drivers/net/* to use module_usb_driver() 2011-11-18 09:44:20 -08:00
zd1201.h