From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 24 Nov 2010 21:49:20 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.38-rc1~476^2~405^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=51cce8a590c4696d62bfacc63378d1036084cef7;p=~emulex%2Finfiniband.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
---

51cce8a590c4696d62bfacc63378d1036084cef7