From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 11 Oct 2011 19:35:42 +0000 (-0400)
Subject: Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into... 
X-Git-Tag: v3.2-rc1~129^2~104^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=094daf7db7c47861009899ce23f9177d761e20b0;p=pandora-kernel.git

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

Conflicts:
	Documentation/feature-removal-schedule.txt
---

094daf7db7c47861009899ce23f9177d761e20b0
Reading git-diff-tree failed