From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 23 Apr 2013 18:09:39 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ec094144cdd54a36e65a69161e9705959c09cb23;p=linux-beck.git

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

Conflicts:
	drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
---

ec094144cdd54a36e65a69161e9705959c09cb23
diff --cc drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
index 18413123efd7,73fe8d6db566..491305c81fce
--- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
@@@ -143,9 -142,8 +143,9 @@@ channel_detector_create(struct dfs_patt
  {
  	u32 sz, i;
  	struct channel_detector *cd;
 +	struct ath_common *common = ath9k_hw_common(dpd->ah);
  
- 	cd = kmalloc(sizeof(*cd), GFP_KERNEL);
+ 	cd = kmalloc(sizeof(*cd), GFP_ATOMIC);
  	if (cd == NULL)
  		goto fail;