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
..
libertas	wireless-drivers-next patches for 4.15	2017-11-04 18:07:50 +09:00
libertas_tf	wireless-drivers-next patches for 4.15	2017-11-04 18:07:50 +09:00
mwifiex	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
Kconfig	net/wireless: fix spaces and grammar copy/paste in vendor Kconfig help text	2018-03-13 18:52:25 +02:00
Makefile
mwl8k.c	mwl8k: Expand non-DFS 5G channels	2017-12-07 15:17:26 +02:00