From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 29 Jun 2012 16:42:14 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.6-rc1~125^2~338^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8732baafc3f19e69df683c3f0f36c13cec746fb9;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
---

8732baafc3f19e69df683c3f0f36c13cec746fb9
Reading git-diff-tree failed