David S. Miller 3efa70d78f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-02-07 16:29:30 -05:00
..
admtek	adm80211: return an error if adm8211_alloc_rings() fails	2016-12-30 13:29:21 +02:00
ath	wireless-drivers-next patches for 4.11	2017-02-01 12:46:17 -05:00
atmel	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
broadcom	brcmfmac: add .update_connect_params() callback	2017-01-31 09:24:59 +02:00
cisco	net: use core MTU range checking in wireless drivers	2016-10-20 14:51:08 -04:00
intel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-02 16:54:00 -05:00
intersil	wireless-drivers-next patches for 4.11	2017-01-02 15:23:34 -05:00
marvell	wireless-drivers-next patches for 4.11	2017-02-01 12:46:17 -05:00
mediatek	Makefile: drop -D__CHECK_ENDIAN__ from cflags	2016-12-16 00:13:43 +02:00
ralink	rt2800: enable rt3290 unconditionally on pci probe	2017-01-31 09:27:38 +02:00
realtek	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-02-07 16:29:30 -05:00
rsi	rsi: Add support for 802.11d	2016-11-25 11:47:36 +02:00
st	cw1200: fix bogus maybe-uninitialized warning	2016-11-17 08:47:58 +02:00
ti	wlcore: print the sdio buffer after reading it	2017-01-28 09:11:08 +02:00
zydas	net: deprecate eth_change_mtu, remove usage	2016-10-13 09:36:57 -04:00
Kconfig	wireless: deprecate WDS and disable by default	2016-10-27 09:08:43 +02:00
mac80211_hwsim.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-11-22 13:27:16 -05:00
mac80211_hwsim.h	drivers/wireless: use nla_put_u64_64bit()	2016-04-26 12:00:48 -04:00
Makefile
ray_cs.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
ray_cs.h
rayctl.h
rndis_wlan.c	nl80211: support beacon report scanning	2016-07-06 14:51:31 +02:00
wl3501_cs.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
wl3501.h