David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-08-06 18:44:57 -07:00

..

certs

…

.gitignore

…

ap.c

…

chan.c

…

core.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-08-06 18:44:57 -07:00

core.h

cfg80211: fix duplicated scan entries after channel switch

2019-07-29 16:23:13 +02:00

debugfs.c

…

debugfs.h

…

ethtool.c

…

ibss.c

…

Kconfig

lib80211: use crypto API ccm(aes) transform for CCMP processing

2019-07-26 13:22:47 +02:00

lib80211_crypt_ccmp.c

lib80211: use crypto API ccm(aes) transform for CCMP processing

2019-07-26 13:22:47 +02:00

lib80211_crypt_tkip.c

…

lib80211_crypt_wep.c

…

lib80211.c

…

Makefile

…

mesh.c

…

mlme.c

…

nl80211.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-08-06 18:44:57 -07:00

nl80211.h

…

ocb.c

…

of.c

…

pmsr.c

…

radiotap.c

…

rdev-ops.h

…

reg.c

…

reg.h

…

scan.c

cfg80211: fix duplicated scan entries after channel switch

2019-07-29 16:23:13 +02:00

sme.c

…

sysfs.c

…

sysfs.h

…

trace.c

…

trace.h

…

util.c

{nl,mac}80211: fix interface combinations on crypto controlled devices

2019-07-26 13:50:43 +02:00

wext-compat.c

…

wext-compat.h

…

wext-core.c

…

wext-priv.c

…

wext-proc.c

…

wext-sme.c

…

wext-spy.c

…