David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three trivial overlapping conflicts. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-05-02 22:14:21 -04:00
..
ipw2x00	wireless-drivers-next patches for 4.21	2018-12-20 16:47:10 -08:00
iwlegacy	iwlegacy: remove redundant assignment to *res	2019-04-04 13:14:47 +03:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-05-02 22:14:21 -04:00
Kconfig	net/wireless: fix spaces and grammar copy/paste in vendor Kconfig help text	2018-03-13 18:52:25 +02:00
Makefile	…