From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 27 Jun 2011 18:26:04 +0000 (-0400)
Subject: Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v3.0-rc7~41^2~22^2^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ed9ed3b82b12ac70aaa654ef32ebf393ec3179e0;p=linux.git

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

ed9ed3b82b12ac70aaa654ef32ebf393ec3179e0