From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 26 Jan 2011 21:12:47 +0000 (-0500)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.39-rc1~468^2~448^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=62362dee83c2a50465cc64ba701ebd741996ec80;p=~shefty%2Frdma-dev.git

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

62362dee83c2a50465cc64ba701ebd741996ec80