From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 28 Aug 2013 14:36:09 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.12-rc1~132^2~84^2^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b35c809708ad245a36bef94d6fb1e83f6ab850aa;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	net/mac80211/ibss.c
---

b35c809708ad245a36bef94d6fb1e83f6ab850aa
Reading git-diff-tree failed