David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-23 18:51:33 -04:00
..
.gitignore
ap.c
chan.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
core.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
core.h
db.txt
debugfs.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
debugfs.h
ethtool.c
genregdb.awk
ibss.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
Kconfig
lib80211.c
lib80211_crypt_ccmp.c
lib80211_crypt_tkip.c
lib80211_crypt_wep.c
Makefile
mesh.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
mlme.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
nl80211.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
nl80211.h
ocb.c
radiotap.c
rdev-ops.h	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
reg.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
reg.h	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
regdb.h
scan.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
sme.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
sysfs.c
sysfs.h
trace.c
trace.h	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
util.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
wext-compat.c	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
wext-compat.h
wext-core.c	wext: unregister_pernet_subsys() on notifier registration failure	2016-04-05 10:48:44 +02:00
wext-priv.c
wext-proc.c
wext-sme.c
wext-spy.c