From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 12 Aug 2013 18:45:06 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.12-rc1~132^2~297^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89c2af3c14ddf8ae48637a7b454d66ac5e0ca728;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ethernet/broadcom/Kconfig
---

89c2af3c14ddf8ae48637a7b454d66ac5e0ca728
Reading git-diff-tree failed