From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 12 Jun 2013 19:39:05 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.11-rc1~64^2~166^2^2~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=812fd645968118c35a3f4d0d18dd3f4d07221df0;p=pandora-kernel.git

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/mac80211.c
---

812fd645968118c35a3f4d0d18dd3f4d07221df0
Reading git-diff-tree failed