David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c include/linux/inetdevice.h The inetdevice.h conflict involves moving the IPV4_DEVCONF values into a UAPI header, overlapping additions of some new entries. The iwlwifi conflict is a context overlap. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-08-26 16:37:08 -04:00
..
.gitignore
ap.c
chan.c	nl80211/cfg80211: add 5 and 10 MHz defines and wiphy flag	2013-06-18 16:06:50 +02:00
core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-08-09 15:06:28 -04:00
core.h	cfg80211/nl80211: Add packet coalesce support	2013-07-16 09:58:00 +03:00
db.txt
debugfs.c	cfg80211: vastly simplify locking	2013-05-25 00:02:15 +02:00
debugfs.h
ethtool.c
ethtool.h
genregdb.awk
ibss.c	cfg80211: separate internal SME implementation	2013-06-04 13:03:11 +02:00
Kconfig
lib80211_crypt_ccmp.c
lib80211_crypt_tkip.c
lib80211_crypt_wep.c
lib80211.c
Makefile
mesh.c	cfg80211/mac80211: get mandatory rates based on scan width	2013-07-16 09:58:07 +03:00
mlme.c	cfg80211: hold BSS over association process	2013-06-19 18:55:39 +02:00
nl80211.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
nl80211.h	cfg80211/nl80211: Add packet coalesce support	2013-07-16 09:58:00 +03:00
radiotap.c
rdev-ops.h	nl80211/cfg80211: add channel switch command	2013-08-01 18:30:28 +02:00
reg.c	regulatory: use correct regulatory initiator on wiphy register	2013-07-25 09:52:46 +02:00
reg.h
regdb.h
scan.c	nl80211: add scan width to bss and scan request structs	2013-07-16 09:58:01 +03:00
sme.c	cfg80211: don't request disconnect if not connected	2013-08-14 14:00:19 +02:00
sysfs.c	cfg80211: fix compilation warning for cfg80211_leave_all()	2013-06-24 15:57:32 +02:00
sysfs.h
trace.c
trace.h	nl80211/cfg80211: add channel switch command	2013-08-01 18:30:28 +02:00
util.c	cfg80211/mac80211: get mandatory rates based on scan width	2013-07-16 09:58:07 +03:00
wext-compat.c	cfg80211: vastly simplify locking	2013-05-25 00:02:15 +02:00
wext-compat.h
wext-core.c
wext-priv.c
wext-proc.c
wext-sme.c	cfg80211: separate internal SME implementation	2013-06-04 13:03:11 +02:00
wext-spy.c