David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-23 16:49:34 -04:00
..
.gitignore
ap.c
chan.c
core.c	cfg80211: don't add p2p device while in RFKILL	2013-10-09 18:40:16 +02:00
core.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
db.txt
debugfs.c	mac80211: fix some snprintf misuses	2013-10-01 12:16:51 +02:00
debugfs.h
ethtool.c
ethtool.h
genregdb.awk	cfg80211: parse dfs region for internal regdb option	2013-10-01 12:18:36 +02:00
ibss.c	cfg80211: fix warning when using WEXT for IBSS	2013-09-26 19:43:14 +02:00
Kconfig
lib80211_crypt_ccmp.c
lib80211_crypt_tkip.c
lib80211_crypt_wep.c
lib80211.c
Makefile
mesh.c
mlme.c
nl80211.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-10-17 14:02:07 -04:00
nl80211.h
radiotap.c	wireless: radiotap: fix parsing buffer overrun	2013-10-14 09:47:00 +02:00
rdev-ops.h
reg.c	regulatory: enable channels 52-64 and 100-144 for world roaming	2013-10-01 14:14:02 +02:00
reg.h
regdb.h
scan.c
sme.c
sysfs.c
sysfs.h	net: misc: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
trace.c
trace.h
util.c	cfg80211: vlan priority handling in WMM	2013-10-02 11:04:33 +02:00
wext-compat.c
wext-compat.h
wext-core.c
wext-priv.c
wext-proc.c
wext-sme.c
wext-spy.c