David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05: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	cfg80211: calls nl80211_exit on error	2015-02-24 11:41:21 +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	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:38 -05: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
Makefile	cfg80211: 802.11p OCB mode handling	2014-11-04 13:18:17 +01:00
mesh.c
mlme.c
nl80211.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05: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	cfg80211: fix n_reg_rules to match world_regdom	2015-02-24 10:58:37 +01: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
sysfs.c
sysfs.h
trace.c
trace.h	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:38 -05:00
util.c	Last round of updates for net-next:	2015-02-04 14:57:45 -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	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:38 -05:00
wext-spy.c