kernel-fxtec-pro1x/drivers/net/wireless
Greg Kroah-Hartman 61906313bd Merge 3.4-rc6 into usb-next
This resolves the conflict with:
	drivers/usb/host/ehci-tegra.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-07 09:03:39 -07:00
..
ath ath5k: add missing iounmap to AHB probe removal 2012-04-27 15:24:07 -04:00
b43 b43: only reload config after successful initialization 2012-04-27 15:25:25 -04:00
b43legacy simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
brcm80211 brcm80211: fmac: fix missing completion events issue 2012-04-27 15:20:39 -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 ipw2200: Fix race condition in the command completion acknowledge 2012-04-23 14:57:49 -04:00
iwlegacy Merge branch 'akpm' (Andrew's patch-bomb) 2012-04-05 15:30:34 -07:00
iwlwifi iwlwifi: use 6000G2B for 6030 device series 2012-04-27 15:25:24 -04:00
iwmc3200wifi simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
libertas libertas: fix signedness bug in lbs_auth_to_authtype() 2012-04-13 14:05:35 -04:00
libertas_tf drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages 2012-01-31 16:20:21 -05:00
mwifiex mwifiex: update pcie8766 scratch register addresses 2012-04-13 14:06:59 -04:00
orinoco net: orinoco: add error handling for failed kmalloc(). 2012-03-28 14:25:35 -04:00
p54 p54pci: use new driver.pm interface for suspend/resume 2012-03-06 15:16:06 -05:00
prism54 Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
rt2x00 rt2x00: Fix rfkill_polling register function. 2012-04-10 14:14:28 -04:00
rtl818x rtl8187: Add AD-HOC support 2012-03-07 13:56:37 -05:00
rtlwifi rtlwifi: Fix oops on unload 2012-04-23 14:57:53 -04:00
wl12xx simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
wl1251 wl1251: fix crash on remove due to leftover work item 2012-04-27 15:25:25 -04: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
adm8211.h
airo.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
airo.h
airo_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
at76c50x-usb.c USB: at76c50x-usb.c: remove err() usage 2012-04-25 14:48:52 -07:00
at76c50x-usb.h
atmel.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
atmel.h
atmel_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
atmel_pci.c
Kconfig
mac80211_hwsim.c mac80211_hwsim: Fix set mactime on receiver hwsim radio 2012-03-12 14:19:35 -04:00
mac80211_hwsim.h
Makefile
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
rndis_wlan.c rndis_wlan: use u8 for key indexes 2012-03-05 15:23:17 -05:00
wl3501.h
wl3501_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
zd1201.c
zd1201.h