John W. Linville 9a244409d0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ...

Conflicts:
	net/mac80211/cfg.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>

2014-07-25 10:22:36 -04:00

..

.gitignore

…

ap.c

…

chan.c

…

core.c

…

core.h

cfg80211: fix elapsed_jiffies calculation

2014-06-23 11:29:25 +02:00

db.txt

…

debugfs.c

…

debugfs.h

…

ethtool.c

…

genregdb.awk

wireless: fixup genregdb.awk for remove of antenna gain from wireless-regd

2014-07-21 12:24:20 +02:00

ibss.c

…

Kconfig

wireless: fixup genregdb.awk for remove of antenna gain from wireless-regd

2014-07-21 12:24:20 +02:00

lib80211_crypt_ccmp.c

…

lib80211_crypt_tkip.c

…

lib80211_crypt_wep.c

…

lib80211.c

…

Makefile

…

mesh.c

…

mlme.c

…

nl80211.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2014-07-22 13:49:34 -04:00

nl80211.h

…

radiotap.c

…

rdev-ops.h

cfg80211: pass TDLS initiator in tdls_mgmt operations

2014-06-23 14:24:55 +02:00

reg.c

Revert "cfg80211: Use 5MHz bandwidth by default when checking usable channels"

2014-06-23 11:06:28 +02:00

reg.h

…

regdb.h

…

scan.c

…

sme.c

…

sysfs.c

…

sysfs.h

…

trace.c

…

trace.h

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2014-07-25 10:22:36 -04:00

util.c

…

wext-compat.c

…

wext-compat.h

…

wext-core.c

…

wext-priv.c

…

wext-proc.c

…

wext-sme.c

…

wext-spy.c

…