From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 19 Apr 2011 19:33:54 +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~369
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=44c866a0a57b08b7090be24ccb33679ed1d4f476;p=~emulex%2Finfiniband.git

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

44c866a0a57b08b7090be24ccb33679ed1d4f476