From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 21 Nov 2012 17:57:56 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=b3117494772d8f906625905c6e203af745ee3530;p=linux-edison.git

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

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
	drivers/net/wireless/iwlwifi/pcie/tx.c
---

b3117494772d8f906625905c6e203af745ee3530