David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -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	2018-12-20 11:53:36 -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 4.21	2018-12-03 15:44:27 -08:00
cisco	wireless: airo: potential buffer overflow in sprintf()	2018-11-06 19:02:43 +02:00
intel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
intersil	net: core: dev: Add extack argument to dev_open()	2018-12-06 13:26:06 -08:00
marvell	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
mediatek	mt76: fix potential NULL pointer dereference in mt76_stop_tx_queues	2018-12-13 16:19:56 +02:00
quantenna	qtnfmac: fix error handling in control path	2018-11-06 18:57:37 +02:00
ralink	rt2x00: rt61pci: mark expected switch fall-through	2018-11-06 18:59:59 +02:00
realtek	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
rsi	rsi: fix spelling mistake "Initialzing" -> "Initializing"	2018-11-06 18:52:10 +02:00
st	cw1200: fix small typo	2018-11-06 19:03:56 +02:00
ti	wireless-drivers-next patches for 4.21	2018-12-03 15:44:27 -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	This time we have too many changes to list, highlights:	2018-12-19 08:36:18 -08: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	ray_cs: mark expected switch fall-throughs	2018-11-06 19:00:01 +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	mac80211-next: rtnetlink wifi simulation device	2018-12-05 15:31:31 +01:00
wl3501_cs.c
wl3501.h