David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
b43	b43: stop leds during suspend	2015-01-23 19:40:40 +02:00
b43legacy	b43legacy: Remove unused b43legacy_radio_set_tx_iq()	2015-01-15 15:35:46 +02:00
brcm80211	brcmfmac: Use put_unaligned_le32	2015-01-23 21:12:52 +02:00
cw1200	Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next	2015-01-22 14:49:44 +02:00
hostap	hostap_cs: fix misspelling of current function in string	2014-12-15 13:46:19 -05:00
ipw2x00	ipw2200: select CFG80211_WEXT	2014-12-24 15:15:25 +02:00
iwlegacy	iwl3945: Use setup_timer	2015-01-07 10:45:08 +02:00
iwlwifi	iwlwifi: mvm: fix rx chains configuration in phy ctxt cmd	2015-01-22 22:17:22 +02:00
libertas	cfg80211: remove enum station_info_flags	2015-01-08 15:28:10 +01:00
libertas_tf
mwifiex	mwifiex: do not emit messages while holding spinlock	2015-01-23 19:06:23 +02:00
orinoco	orinoco/hermes: select CFG80211_WEXT	2015-01-15 15:04:10 +02:00
p54	p54pci: add handling of signal case	2015-01-23 21:37:04 +02:00
prism54
rsi	rsi: fix memory leak in rsi_load_ta_instructions()	2014-12-24 17:26:08 +02:00
rt2x00	Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next	2015-01-22 14:49:44 +02:00
rtl818x	rtl818x_pci: fix response rate may be incorrect.	2014-10-07 14:48:37 -04:00
rtlwifi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next	2015-01-26 16:09:45 -08:00
ti	wlcore: unlock on error in wl1271_op_suspend()	2015-01-23 19:37:42 +02:00
zd1211rw	zd1211rw: fix misspelling of current function in string	2014-12-15 13:46:19 -05:00
adm8211.c	adm8211: fix error return code	2015-01-15 14:44:42 +02:00
adm8211.h
airo_cs.c
airo.c
airo.h
at76c50x-usb.c
at76c50x-usb.h
atmel_cs.c
atmel_pci.c
atmel.c	atmel: Remove open-coded and wrong strcasecmp	2015-01-23 21:38:54 +02:00
atmel.h
Kconfig
mac80211_hwsim.c	Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next	2015-01-22 14:49:44 +02:00
mac80211_hwsim.h	mac80211-hwsim: Add HWSIM_CMD_GET_RADIO command	2014-11-19 18:59:32 +01:00
Makefile
mwl8k.c	cfg80211: remove "channel" from survey names	2015-01-08 15:27:52 +01:00
ray_cs.c
ray_cs.h
rayctl.h
rndis_wlan.c	cfg80211: remove enum station_info_flags	2015-01-08 15:28:10 +01:00
wl3501_cs.c
wl3501.h
zd1201.c
zd1201.h