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

diff --cc arch/powerpc/configs/ppc64_defconfig
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/wireless/airo.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/pci.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/rc.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-3945.c
index 6cde661ce0bcb52be05315cf239c08b2b0cb94cf,57194bbd2762b88f5484b5655be09a4aef5a2800..6940f086823c97b825d2f1c1cb904dfab52a1619
--- 1/drivers/net/wireless/iwlwifi/iwl-3945.c
--- 2/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@@ -2847,9 -2845,10 +2845,10 @@@ static struct iwl_cfg iwl3945_abg_cfg 
        .ht_greenfield_support = false,
        .led_compensation = 64,
        .broken_powersave = true,
+       .plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
  };
  
 -struct pci_device_id iwl3945_hw_card_ids[] = {
 +DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {
        {IWL_PCI_DEVICE(0x4222, 0x1005, iwl3945_bg_cfg)},
        {IWL_PCI_DEVICE(0x4222, 0x1034, iwl3945_bg_cfg)},
        {IWL_PCI_DEVICE(0x4222, 0x1044, iwl3945_bg_cfg)},

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

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

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

diff --cc drivers/net/wireless/p54/p54pci.c
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8180_dev.c
Simple merge

diff --cc net/mac80211/driver-trace.h
Simple merge