David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07: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 ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
atmel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2018-06-06 18:39:49 -07:00
broadcom	wireless-drivers fixes for 4.18	2018-07-03 23:29:29 +09:00
cisco	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
intel	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
intersil	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
marvell	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
mediatek	mt7601u: remove warning when avg_rssi is zero	2018-06-24 20:01:38 +03:00
quantenna	wireless-drivers fixes for 4.18	2018-07-03 23:29:29 +09:00
ralink	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
realtek	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
rsi	rsi: fix spelling mistake "Uknown" -> "Unknown"	2018-05-29 10:21:35 +03:00
st	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
ti	wlcore: sdio: check for valid platform device data before suspend	2018-05-29 10:20:56 +03:00
zydas	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
Kconfig
mac80211_hwsim.c	mac80211_hwsim: fix module init error paths	2018-06-15 13:02:02 +02:00
mac80211_hwsim.h
Makefile
ray_cs.c	proc: introduce proc_create_single{,_data}	2018-05-16 07:23:35 +02:00
ray_cs.h
rayctl.h
rndis_wlan.c
wl3501_cs.c
wl3501.h