David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
.gitignore
ap.c
chan.c	cfg80211: Fix 160 MHz channels with 80+80 and 160 MHz drivers	2014-12-12 12:18:47 +01:00
core.c	Revert "wireless: Support of IFLA_INFO_KIND rtnl attribute"	2015-01-19 18:49:56 +01:00
core.h	nl80211: Stop scheduled scan if netlink client disappears	2014-12-18 14:38:44 +01:00
db.txt
debugfs.c
debugfs.h
ethtool.c
genregdb.awk
ibss.c	cfg80211: clear connect keys when freeing them	2014-09-11 12:07:18 +02:00
Kconfig	Revert "cfg80211: make WEXT compatibility unselectable"	2014-12-30 16:42:29 -08:00
lib80211_crypt_ccmp.c
lib80211_crypt_tkip.c
lib80211_crypt_wep.c
lib80211.c	lib80211: remove unused print_ssid()	2014-10-14 02:18:27 +02:00
Makefile	cfg80211: 802.11p OCB mode handling	2014-11-04 13:18:17 +01:00
mesh.c
mlme.c	cfg80211/mac80211: add wmm info to assoc event	2014-09-11 12:24:39 +02:00
nl80211.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
nl80211.h	cfg80211: allow wiphy specific regdomain management	2014-12-17 11:49:55 +01:00
ocb.c	cfg80211: 802.11p OCB mode handling	2014-11-04 13:18:17 +01:00
radiotap.c
rdev-ops.h	cfg80211: introduce TDLS channel switch commands	2014-11-19 18:45:12 +01:00
reg.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
reg.h	cfg80211: allow usermode to query wiphy specific regdom	2014-12-17 11:49:55 +01:00
regdb.h
scan.c	nl80211: Convert sched_scan_req pointer to RCU pointer	2014-12-18 14:38:09 +01:00
sme.c	cfg80211: set the rates mask in connection probes over specified freq	2014-10-10 17:11:13 +02:00
sysfs.c
sysfs.h
trace.c
trace.h	cfg80211: add scan time to survey data	2015-01-08 15:27:58 +01:00
util.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
wext-compat.c	cfg80211: remove enum station_info_flags	2015-01-08 15:28:10 +01:00
wext-compat.h
wext-core.c
wext-priv.c
wext-proc.c
wext-sme.c	cfg80211: clear connect keys when freeing them	2014-09-11 12:07:18 +02:00
wext-spy.c