From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 26 Feb 2010 21:58:18 +0000 (-0500)
Subject: Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi... 
X-Git-Tag: v2.6.34-rc1~233^2~49^2~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=be41f5c7e3688a4555d7fbaa09578fd628bb4cdf;p=~shefty%2Frdma-dev.git

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

be41f5c7e3688a4555d7fbaa09578fd628bb4cdf