From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 3 Aug 2011 13:18:21 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for... 
X-Git-Tag: v3.1-rc1~24^2~10^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a5d5a914770a81a1f775be2ee35b9fa8fd19d381;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
---

a5d5a914770a81a1f775be2ee35b9fa8fd19d381