Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c

diff --cc drivers/net/wireless/iwlwifi/dvm/mac80211.c
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/pcie/rx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index f21bf661931d44d7a73ef3a87bd0f471db4ecab1,9f317b016df8cfb740c19f26f708885b2c24d2a7..f6c21e7edaf2eccd13fe5adb0a27f7f0d8359621
--- 1/drivers/net/wireless/iwlwifi/pcie/trans.c
--- 2/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -2180,8 -1297,16 +1293,15 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
        pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
  
        err = pci_enable_msi(pdev);
-       if (err)
+       if (err) {
 -              dev_printk(KERN_ERR, &pdev->dev,
 -                         "pci_enable_msi failed(0X%x)\n", err);
 +              dev_err(&pdev->dev, "pci_enable_msi failed(0X%x)\n", err);
+               /* enable rfkill interrupt: hw bug w/a */
+               pci_read_config_word(pdev, PCI_COMMAND, &pci_cmd);
+               if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {
+                       pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;
+                       pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);
+               }
+       }
  
        trans->dev = &pdev->dev;
        trans_pcie->irq = pdev->irq;