David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-24 12:06:19 -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 ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git	2019-02-20 20:01:27 +02:00
atmel	atmel: Replace mdelay() with msleep() in probe_atmel_card()	2018-07-31 10:25:33 +03:00
broadcom	brcmfmac: add basic validation of shared RAM address	2019-02-20 19:55:22 +02:00
cisco	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-12-27 13:53:32 -08:00
intel	wireless-drivers-next patches for 5.1	2019-02-22 12:56:24 -08:00
intersil	orinoco : Replace function name in string with __func__	2019-02-19 17:17:13 +02:00
marvell	libertas_tf: get the MAC address before registering the device	2019-02-20 19:55:54 +02:00
mediatek	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-20 00:34:07 -08:00
quantenna	qtnfmac: enable WPA3 SAE support	2019-02-08 17:30:24 +02:00
ralink	rt2800: comment and simplify AGC init for RT6352	2019-02-19 17:18:57 +02:00
realtek	rtlwifi: rtl8192ce: fix typo, "PairwiseENcAlgorithm" -> "PairwiseEncAlgorithm"	2019-02-20 19:54:53 +02:00
rsi	rsi: remove set but not used variables 'info, vif'	2019-02-19 17:09:25 +02:00
st	cw1200: no need to check return value of debugfs_create functions	2019-02-01 14:34:56 +02:00
ti	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-08 15:00:17 -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
Makefile	mac80211-next: rtnetlink wifi simulation device	2018-12-05 15:31:31 +01:00
mac80211_hwsim.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-24 12:06:19 -08:00
mac80211_hwsim.h	mac80211_hwsim: allow configurable cipher types	2018-11-09 11:36:15 +01:00
ray_cs.c	wireless: remove unneeded semicolon	2019-02-01 14:25:41 +02:00
ray_cs.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
rayctl.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
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	virt_wifi: Remove REGULATORY_WIPHY_SELF_MANAGED	2019-02-11 17:10:48 +01:00
wl3501.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
wl3501_cs.c	wl3501_cs: fix spelling mistake: "Insupported" -> "Unsupported"	2017-07-28 18:06:31 +03:00