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

Conflicts:
	drivers/net/wireless/ath/ath9k/hw.c

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

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

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

diff --cc drivers/net/wireless/mwifiex/pcie.c
index f4fbad95d3e392fa7ce324566ed9d3634a075071,e1f45ecf39a5ac203090c4f97fe608ef37db77ca..5867facd415d445e1bfd12ae160dd6834ba6aa3e
--- 1/drivers/net/wireless/mwifiex/pcie.c
--- 2/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@@ -83,11 -83,13 +83,11 @@@ static int mwifiex_pcie_probe(struct pc
        struct pcie_service_card *card;
  
        pr_debug("info: vendor=0x%4.04X device=0x%4.04X rev=%d\n",
-                               pdev->vendor, pdev->device, pdev->revision);
+                pdev->vendor, pdev->device, pdev->revision);
  
        card = kzalloc(sizeof(struct pcie_service_card), GFP_KERNEL);
 -      if (!card) {
 -              pr_err("%s: failed to alloc memory\n", __func__);
 +      if (!card)
                return -ENOMEM;
 -      }
  
        card->dev = pdev;
  

diff --cc drivers/net/wireless/mwifiex/sdio.c
index 8359027502313da830a1c73e5c57a82465d51bf3,3f597f4a3f5e42521448f0b218593547916ffd0d..f8012e2b7f7c735c99394f314a314073a330dd87
--- 1/drivers/net/wireless/mwifiex/sdio.c
--- 2/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@@ -67,11 -67,13 +67,11 @@@ mwifiex_sdio_probe(struct sdio_func *fu
        struct sdio_mmc_card *card = NULL;
  
        pr_debug("info: vendor=0x%4.04X device=0x%4.04X class=%d function=%d\n",
-              func->vendor, func->device, func->class, func->num);
+                func->vendor, func->device, func->class, func->num);
  
        card = kzalloc(sizeof(struct sdio_mmc_card), GFP_KERNEL);
 -      if (!card) {
 -              pr_err("%s: failed to alloc memory\n", __func__);
 +      if (!card)
                return -ENOMEM;
 -      }
  
        card->func = func;