From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 16 Mar 2012 17:45:25 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=01a282980937f9ca55a3cb06b9c6ff1cc49ea396;p=~shefty%2Frdma-dev.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

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

01a282980937f9ca55a3cb06b9c6ff1cc49ea396
diff --cc drivers/net/wireless/mwifiex/pcie.c
index f4fbad95d3e,e1f45ecf39a..5867facd415
--- a/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 83590275023,3f597f4a3f5..f8012e2b7f7
--- a/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;