From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 2 Dec 2011 20:44:03 +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~261^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7a4858c0fde8383f7aa494eda0fba6bef3f2fec;p=pandora-kernel.git

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

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

d7a4858c0fde8383f7aa494eda0fba6bef3f2fec
Reading git-diff-tree failed