Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Feb 2010 21:54:45 +0000 (16:54 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Feb 2010 21:54:45 +0000 (16:54 -0500)
commit64463da913bc8f791980ba28d93ac5e716ab9cc5
treecf958678f7cf0b615a52356beb2d18240424ab4a
parent4a6967b88af02eebeedfbb91bc09160750225bb5
parenta120e912eb51e347f36c71b60a1d13af74d30e83
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
net/mac80211/rate.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwmc3200wifi/rx.c
drivers/net/wireless/rtl818x/rtl8187_dev.c
net/mac80211/rate.c