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

Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/wl12xx/main.c
---

8e00f5fbb4ecbc3431fa686cba60cd76a62604af
Reading git-diff-tree failed