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

..

certs

…

.gitignore

…

ap.c

…

chan.c

…

core.c

…

core.h

Merge remote-tracking branch 'net-next/master' into mac80211-next

2019-02-22 13:48:13 +01:00

debugfs.c

…

debugfs.h

…

ethtool.c

…

ibss.c

…

Kconfig

…

lib80211_crypt_ccmp.c

…

lib80211_crypt_tkip.c

…

lib80211_crypt_wep.c

…

lib80211.c

…

Makefile

…

mesh.c

…

mlme.c

cfg80211: Report Association Request frame IEs in association events

2019-02-22 13:35:09 +01:00

nl80211.c

genetlink: optionally validate strictly/dumps

2019-04-27 17:07:22 -04:00

nl80211.h

cfg80211: Report Association Request frame IEs in association events

2019-02-22 13:35:09 +01:00

ocb.c

…

of.c

…

pmsr.c

netlink: make validation more configurable for future strictness

2019-04-27 17:07:21 -04:00

radiotap.c

…

rdev-ops.h

cfg80211: add support to probe unexercised mesh link

2019-04-26 13:02:11 +02:00

reg.c

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

2019-05-02 22:14:21 -04:00

reg.h

cfg80211: restore regulatory without calling userspace

2019-02-11 15:46:29 +01:00

scan.c

Merge tag 'mac80211-next-for-davem-2019-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2019-04-26 16:05:52 -04:00

sme.c

…

sysfs.c

…

sysfs.h

…

trace.c

…

trace.h

cfg80211: add support to probe unexercised mesh link

2019-04-26 13:02:11 +02:00

util.c

Merge tag 'mac80211-next-for-davem-2019-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2019-04-26 16:05:52 -04:00

wext-compat.c

cfg80211: remove redundant zero check on variable 'changed'

2019-04-26 13:02:11 +02:00

wext-compat.h

…

wext-core.c

…

wext-priv.c

…

wext-proc.c

…

wext-sme.c

…

wext-spy.c

…