Johannes Berg 944b9e375d Merge remote-tracking branch 'mac80211/master' into mac80211-next ... Pull in mac80211.git to let the next patch apply without conflicts, also resolving a hwsim conflict. Conflicts: drivers/net/wireless/mac80211_hwsim.c Signed-off-by: Johannes Berg <johannes.berg@intel.com>		2012-09-06 15:56:02 +02:00
..
.gitignore
ap.c	cfg80211: add channel tracking for AP and mesh	2012-06-29 13:39:15 +02:00
chan.c	cfg80211: add P2P Device abstraction	2012-08-20 13:58:21 +02:00
core.c	cfg80211: add P2P Device abstraction	2012-08-20 13:58:21 +02:00
core.h	cfg80211: reduce monitor interface tracking	2012-07-13 16:16:11 +02:00
db.txt
debugfs.c
debugfs.h
ethtool.c
ethtool.h
genregdb.awk
ibss.c	cfg80211: respect iface combinations when starting operation	2012-06-29 13:39:19 +02:00
Kconfig	cfg80211: add CONFIG_CFG80211_CERTIFICATION_ONUS	2012-07-17 12:13:51 +02:00
lib80211.c
lib80211_crypt_ccmp.c
lib80211_crypt_tkip.c
lib80211_crypt_wep.c
Makefile	cfg80211: introduce cfg80211_stop_ap	2012-06-29 13:39:14 +02:00
mesh.c	cfg80211: respect iface combinations when starting operation	2012-06-29 13:39:19 +02:00
mlme.c	cfg80211: add P2P Device abstraction	2012-08-20 13:58:21 +02:00
nl80211.c	Merge remote-tracking branch 'mac80211/master' into mac80211-next	2012-09-06 15:56:02 +02:00
nl80211.h	cfg80211: support TX error rate CQM	2012-07-17 11:57:23 +02:00
radiotap.c	wireless: add radiotap A-MPDU status field	2012-08-20 13:53:09 +02:00
reg.c	Merge remote-tracking branch 'mac80211/master' into mac80211-next	2012-09-06 15:56:02 +02:00
reg.h	cfg80211: make regulatory_update() static	2012-07-17 12:16:40 +02:00
regdb.h
scan.c	cfg80211: fix indentation	2012-09-05 16:54:05 +02:00
sme.c	nl80211: move scan API to wdev	2012-07-12 12:10:41 +02:00
sysfs.c
sysfs.h
util.c	cfg80211: add P2P Device abstraction	2012-08-20 13:58:21 +02:00
wext-compat.c	cfg80211/mac80211: re-add get_channel operation	2012-07-13 16:16:11 +02:00
wext-compat.h
wext-core.c	wext: include wireless event id when it has a size problem	2012-09-05 16:12:44 +02:00
wext-priv.c
wext-proc.c
wext-sme.c	cfg80211: clarify set_channel APIs	2012-06-06 15:18:17 -04:00
wext-spy.c