From: Wey-Yi Guy Date: Thu, 8 Dec 2011 23:00:27 +0000 (-0800) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... X-Git-Tag: v3.3-rc1~182^2~178^2~125^2~15 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e5cd9ec191e8190c3b8c55f0e0c27b7e1da040e6;p=~emulex%2Finfiniband.git Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless-next --- e5cd9ec191e8190c3b8c55f0e0c27b7e1da040e6