From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 2 May 2014 17:47:50 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.16-rc1~27^2~279^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=406a94d7fae94a893c3afb9c2d18c83124d3cd9b;p=~emulex%2Finfiniband.git

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

406a94d7fae94a893c3afb9c2d18c83124d3cd9b