From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 28 Sep 2011 14:28:09 +0000 (-0400)
Subject: Merge branch 'master' of git://git.infradead.org/users/linville/wireless
X-Git-Tag: v3.2-rc1~129^2~183^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0874073570d9184a169a4ae2abbe8dbcb71878e9;p=pandora-kernel.git

Merge branch 'master' of git://git.infradead.org/users/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-scan.c
	net/wireless/nl80211.c
---

0874073570d9184a169a4ae2abbe8dbcb71878e9
Reading git-diff-tree failed