From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 10 May 2011 19:49:11 +0000 (-0400)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.0-rc2~7^2~16^2~152
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d21844c7c23a71acea6fd68365b09b40e252a876;p=linux.git

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

d21844c7c23a71acea6fd68365b09b40e252a876