David S. Miller 3ab0a7a0c3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Two minor conflicts: 1) net/ipv4/route.c, adding a new local variable while moving another local variable and removing it's initial assignment. 2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes. One pretty prints the port mode differently, whilst another changes the driver to try and obtain the port mode from the port node rather than the switch node. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-09-22 16:45:34 -07:00
..
certs
.gitignore
ap.c
chan.c	nl80211: support setting S1G channels	2020-09-18 12:31:17 +02:00
core.c	mm, treewide: rename kzfree() to kfree_sensitive()	2020-08-07 11:33:22 -07:00
core.h	net: wireless: delete duplicated word + fix grammar	2020-08-27 11:23:16 +02:00
debugfs.c
debugfs.h
ethtool.c
ibss.c	mm, treewide: rename kzfree() to kfree_sensitive()	2020-08-07 11:33:22 -07:00
Kconfig	lib80211: fix unmet direct dependendices config warning when !CRYPTO	2020-09-18 11:37:24 +02:00
lib80211_crypt_ccmp.c
lib80211_crypt_tkip.c	mm, treewide: rename kzfree() to kfree_sensitive()	2020-08-07 11:33:22 -07:00
lib80211_crypt_wep.c	mm, treewide: rename kzfree() to kfree_sensitive()	2020-08-07 11:33:22 -07:00
lib80211.c	lib80211: Remove unused macro DRV_NAME	2020-09-18 11:53:00 +02:00
Makefile
mesh.c	cfg80211/mac80211: add mesh_param "mesh_nolearn" to skip path discovery	2020-07-31 09:24:23 +02:00
mlme.c	net: wireless: Convert to use the preferred fallthrough macro	2020-08-27 11:24:28 +02:00
nl80211.c	nl80211: Unsolicited broadcast probe response support	2020-09-18 14:06:20 +02:00
nl80211.h
ocb.c
of.c
pmsr.c
radiotap.c
rdev-ops.h
reg.c	cfg80211: regulatory: handle S1G channels	2020-09-18 12:29:23 +02:00
reg.h
scan.c	net: wireless: Convert to use the preferred fallthrough macro	2020-08-27 11:24:28 +02:00
sme.c	net: wireless: Convert to use the preferred fallthrough macro	2020-08-27 11:24:28 +02:00
sysfs.c
sysfs.h
trace.c
trace.h	cfg80211/mac80211: add mesh_param "mesh_nolearn" to skip path discovery	2020-07-31 09:24:23 +02:00
util.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-09-22 16:45:34 -07:00
wext-compat.c	net: wireless: Convert to use the preferred fallthrough macro	2020-08-27 11:24:28 +02:00
wext-compat.h
wext-core.c
wext-priv.c
wext-proc.c
wext-sme.c	mm, treewide: rename kzfree() to kfree_sensitive()	2020-08-07 11:33:22 -07:00
wext-spy.c