From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 22 Nov 2010 20:28:30 +0000 (-0500)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.38-rc1~476^2~405^2^2~56
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=840fd8ff64f7b6c9cbfa9b7d0419f015f33303ff;p=linux-pvops.git

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
---

840fd8ff64f7b6c9cbfa9b7d0419f015f33303ff