David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-06-17 20:20:36 -07:00
..
admtek	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
atmel	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
broadcom	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 157	2019-05-30 11:26:37 -07:00
cisco	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
intel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
intersil	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 342	2019-06-05 17:37:07 +02:00
marvell	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
mediatek	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174	2019-05-30 11:26:41 -07:00
quantenna	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
ralink	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
realtek	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
rsi	rsi: Properly initialize data in rsi_sdio_ta_reset	2019-05-28 14:31:36 +03:00
st	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
ti	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 336	2019-06-05 17:37:07 +02:00
zydas	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
mac80211_hwsim.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07: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	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 416	2019-06-05 17:37:15 +02:00
ray_cs.h
rayctl.h
rndis_wlan.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
virt_wifi.c	virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED	2019-02-11 17:10:48 +01:00
wl3501_cs.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
wl3501.h