David S. Miller 375ca548f7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Two easily resolvable overlapping change conflicts, one in TCP and one in the eBPF verifier. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-20 00:34:07 -08:00
..
admtek	net/wireless: fix spaces and grammar copy/paste in vendor Kconfig help text	2018-03-13 18:52:25 +02:00
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
atmel	atmel: Replace mdelay() with msleep() in probe_atmel_card()	2018-07-31 10:25:33 +03:00
broadcom	wireless-drivers-next patches for 5.1	2019-02-06 09:36:36 -08:00
cisco	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-12-27 13:53:32 -08:00
intel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
intersil	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-12-27 13:53:32 -08:00
marvell	mwifiex: no need to check return value of debugfs_create functions	2019-02-01 14:39:57 +02:00
mediatek	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-20 00:34:07 -08:00
quantenna	qtnfmac: no need to check return value of debugfs_create functions	2019-02-01 14:34:13 +02:00
ralink	wireless-drivers-next patches for 5.1	2019-02-06 09:36:36 -08:00
realtek	wireless: prefix header search paths with $(srctree)/	2019-02-01 14:42:25 +02:00
rsi	rsi: no need to check return value of debugfs_create functions	2019-02-01 14:38:21 +02:00
st	cw1200: no need to check return value of debugfs_create functions	2019-02-01 14:34:56 +02:00
ti	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -08:00
zydas	zd1201: mark expected switch fall-through	2018-11-06 19:00:12 +02:00
Kconfig	mac80211-next: rtnetlink wifi simulation device	2018-12-05 15:31:31 +01:00
mac80211_hwsim.c	mac80211_hwsim: check that n_limits makes sense	2019-01-19 09:10:30 +01:00
mac80211_hwsim.h	mac80211_hwsim: allow configurable cipher types	2018-11-09 11:36:15 +01:00
Makefile	mac80211-next: rtnetlink wifi simulation device	2018-12-05 15:31:31 +01:00
ray_cs.c	wireless: remove unneeded semicolon	2019-02-01 14:25:41 +02:00
ray_cs.h
rayctl.h
rndis_wlan.c	wireless-drivers: use BIT_ULL for NL80211_STA_INFO_ attribute types	2018-06-27 19:07:39 +03:00
virt_wifi.c	Merge remote-tracking branch 'net-next/master' into mac80211-next	2019-02-01 11:05:35 +01:00
wl3501_cs.c
wl3501.h