From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 25 Apr 2012 17:41:25 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.4-rc6~23^2~39^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=395836282f7cf8b1dac9b9c2aa2bacddfa1580b5;p=~emulex%2Finfiniband.git

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

395836282f7cf8b1dac9b9c2aa2bacddfa1580b5