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

diff --cc drivers/net/wireless/iwlegacy/iwl-4965.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-2000.c
index a37c41b405c071477bd9d4c55f700d2305419960,2282279cffc454c5089277a6cb1f279a60ad2dab..5484ab712da80c7145f1d5faf172c84635321306
--- 1/drivers/net/wireless/iwlwifi/iwl-2000.c
--- 2/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@@ -256,8 -183,8 +183,7 @@@ static struct iwl_lib_ops iwl2000_lib 
        .setup_deferred_work = iwlagn_bt_setup_deferred_work,
        .cancel_deferred_work = iwlagn_bt_cancel_deferred_work,
        .is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
 -      .send_tx_power = iwlagn_send_tx_power,
        .update_chain_flags = iwl_update_chain_flags,
-       .set_channel_switch = iwl2030_hw_channel_switch,
        .apm_ops = {
                .init = iwl_apm_init,
                .config = iwl2000_nic_config,

diff --cc drivers/net/wireless/iwlwifi/iwl-5000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-6000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
Simple merge