Merge remote-tracking branch 'wireless/master'

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-pci.c
index 2fdbffa079c1fdc4aa0529d5c2b0a885c8a18870,e41f53e5c307e702924fb23b349e4d4bf9de5073..1e69f485bc910361fdcce208e3a3187af5af8f5c
--- 1/drivers/net/wireless/iwlwifi/iwl-pci.c
--- 2/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@@ -478,25 -483,30 +483,25 @@@ out_no_pci
        return err;
  }
  
 -static void iwl_pci_down(struct iwl_bus *bus)
 -{
 -      struct iwl_pci_bus *pci_bus = (struct iwl_pci_bus *) bus->bus_specific;
 -
 -      pci_disable_msi(pci_bus->pci_dev);
 -      pci_iounmap(pci_bus->pci_dev, pci_bus->hw_base);
 -      pci_release_regions(pci_bus->pci_dev);
 -      pci_disable_device(pci_bus->pci_dev);
 -      pci_set_drvdata(pci_bus->pci_dev, NULL);
 -
 -      kfree(bus);
 -}
 -
  static void __devexit iwl_pci_remove(struct pci_dev *pdev)
  {
-       struct iwl_priv *priv = pci_get_drvdata(pdev);
-       struct iwl_bus *bus = priv->bus;
+       struct iwl_shared *shrd = pci_get_drvdata(pdev);
+       struct iwl_bus *bus = shrd->bus;
 +      struct iwl_pci_bus *pci_bus = IWL_BUS_GET_PCI_BUS(bus);
 +      struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus);
  
-       iwl_remove(priv);
+       iwl_remove(shrd->priv);
  
 -      iwl_pci_down(bus);
 +      pci_disable_msi(pci_dev);
 +      pci_iounmap(pci_dev, pci_bus->hw_base);
 +      pci_release_regions(pci_dev);
 +      pci_disable_device(pci_dev);
 +      pci_set_drvdata(pci_dev, NULL);
 +
 +      kfree(bus);
  }
  
- #ifdef CONFIG_PM
+ #ifdef CONFIG_PM_SLEEP
  
  static int iwl_pci_suspend(struct device *device)
  {

diff --cc drivers/net/wireless/wl12xx/acx.c
Simple merge

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

diff --cc drivers/net/wireless/wl12xx/sdio.c
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc net/mac80211/mesh_pathtbl.c
Simple merge