Johannes Berg d107babca2 iwlwifi: pcie: fix merge damage ... The merge b35c8097 seems to have lost commit eabc4ac5d, put the code back. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2013-10-07 13:34:43 -04:00
..
ath	ath9k: fix tx queue scheduling after channel changes	2013-10-07 13:34:43 -04:00
b43	Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2013-09-03 21:45:31 -04:00
b43legacy	drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent	2013-08-29 21:55:23 -04:00
brcm80211	brcmsmac: call bcma_core_pci_power_save() from non-atomic context	2013-09-26 14:02:34 -04:00
cw1200	cw1200: Use a threaded oneshot irq handler for cw1200_spi	2013-09-26 14:02:31 -04:00
hostap	net: hostap: inherit addr_assign_type along with dev_addr	2013-09-03 20:57:49 -04:00
ipw2x00	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
iwlegacy	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-08-28 10:36:09 -04:00
iwlwifi	iwlwifi: pcie: fix merge damage	2013-10-07 13:34:43 -04:00
libertas	net: libertas: inherit addr_assign_type along with dev_addr	2013-09-03 20:57:50 -04:00
libertas_tf
mwifiex	mwifiex: fix SDIO interrupt lost issue	2013-09-30 16:19:28 -04:00
orinoco	net/trivial: replace numeric with standard PM state macros	2013-06-28 22:11:48 -07:00
p54	p54usb: add USB ID for Corega WLUSB2GTST USB adapter	2013-09-26 14:02:32 -04:00
prism54
rt2x00	Revert "rt2x00pci: Use PCI MSIs whenever possible"	2013-09-30 16:19:28 -04:00
rtl818x	rtl8187: fix use after free on failure path in rtl8187_init_urbs()	2013-09-09 14:42:00 -04:00
rtlwifi	rtlwifi: Align private space in rtl_priv struct	2013-09-26 14:02:30 -04:00
ti	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
zd1211rw
adm8211.c
adm8211.h
airo_cs.c
airo.c	net: airo: inherit addr_assign_type along with dev_addr	2013-09-03 20:57:49 -04:00
airo.h
at76c50x-usb.c
at76c50x-usb.h
atmel_cs.c
atmel_pci.c
atmel.c	atmel: printing bogus information	2013-05-22 14:51:11 -04:00
atmel.h
Kconfig	cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets	2013-05-29 15:26:40 -04:00
mac80211_hwsim.c	mac80211_hwsim: fix error return code in init_mac80211_hwsim()	2013-08-26 09:52:58 +02:00
mac80211_hwsim.h
Makefile	cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets	2013-05-29 15:26:40 -04:00
mwl8k.c	mwl8k: Fix the firmware hang issue for 8764	2013-05-24 13:18:22 -04:00
ray_cs.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
ray_cs.h
rayctl.h
rndis_wlan.c
wl3501_cs.c
wl3501.h
zd1201.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-08-28 10:36:09 -04:00
zd1201.h