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

diff --cc drivers/net/wireless/iwlwifi/dvm/dev.h
Simple merge

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

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/dvm/rxon.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
index 2b7e8a0b1cd452abf0ad7a929b17199327a20c23,a93a170b6f2cc9d466782f9e6e25fb909e85c47f..c2e141af353c657c86dc0a8b86dff9a4515a9186
--- 1/drivers/net/wireless/iwlwifi/pcie/drv.c
--- 2/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@@ -290,10 -295,10 +295,10 @@@ out_free_drv
  out_free_trans:
        iwl_trans_pcie_free(iwl_trans);
        pci_set_drvdata(pdev, NULL);
-       return -EFAULT;
+       return ret;
  }
  
 -static void __devexit iwl_pci_remove(struct pci_dev *pdev)
 +static void iwl_pci_remove(struct pci_dev *pdev)
  {
        struct iwl_trans *trans = pci_get_drvdata(pdev);
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

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

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