From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 12 Jun 2012 18:09:59 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.6-rc1~125^2~57^2~319^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a59f975a78f0606a3a364939dfa9b949d5f87521;p=pandora-kernel.git

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

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

a59f975a78f0606a3a364939dfa9b949d5f87521
Reading git-diff-tree failed