From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 4 Nov 2013 19:51:28 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.13-rc1~105^2~55^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87bc0728d462ae37841a550542829aa65a97e7c2;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/sdio_host.h
---

87bc0728d462ae37841a550542829aa65a97e7c2
Reading git-diff-tree failed