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

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
---

4d8b61490c14a36efdee4a8bf523e26809df05ac
Reading git-diff-tree failed