Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
commitd346f49d0badd80aa9fc699fa9c6d5b23e778eb6
authorDavid S. Miller <davem@davemloft.net>
Sat, 26 Dec 2009 00:34:56 +0000 (25 16:34 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 26 Dec 2009 00:34:56 +0000 (25 16:34 -0800)
tree9e9698ffe7966fbe7ce924a30843f87cdfa2646e
parentd87fd25d5ac4cd044e21b749a8f6cac90f093c71
parentb6ce5c33001b1dc83e6a1a6f30c5dccccea651b6
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6
29 files changed:
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwmc3200wifi/rx.c
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/dev.h
drivers/net/wireless/libertas/main.c
drivers/net/wireless/libertas/wext.c
drivers/net/wireless/wl12xx/wl1251_main.c
include/linux/ieee80211.h
include/net/mac80211.h
net/mac80211/cfg.c
net/mac80211/ht.c
net/mac80211/ieee80211_i.h
net/mac80211/main.c
net/mac80211/mesh.c
net/mac80211/mesh_hwmp.c
net/mac80211/mesh_pathtbl.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/mac80211/scan.c
net/mac80211/util.c
net/wireless/reg.c
net/wireless/wext-compat.c