From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 28 Jun 2013 17:18:21 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.11-rc1~64^2~78^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57ed5cd695d7373b8ae0ae9f10fe945e774d58f0;p=pandora-kernel.git

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

Conflicts:
	net/wireless/nl80211.c
---

57ed5cd695d7373b8ae0ae9f10fe945e774d58f0
Reading git-diff-tree failed