From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 14 Dec 2011 19:35:41 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.3-rc1~182^2~178^2~51
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d22df200beccb1dea26fe4d8684ed93ae2f0aeb;p=pandora-kernel.git

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
---

5d22df200beccb1dea26fe4d8684ed93ae2f0aeb
Reading git-diff-tree failed