Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

2026-11-10 20:48:12 +00:00 · 2011-11-28 19:21:10 -05:00 · 2011-11-28 19:21:10 -05:00 · 8317e2047e
commit 8317e2047e
parent 2c55a3d08a 39338b5638
172 changed files with 45114 additions and 44125 deletions
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
--- a/net/mac80211/wep.c
+++ b/net/mac80211/wep.c
--- a/net/mac80211/work.c
+++ b/net/mac80211/work.c
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
--- a/net/wireless/reg.h
+++ b/net/wireless/reg.h
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
--- a/net/wireless/util.c
+++ b/net/wireless/util.c