From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 24 Feb 2014 21:34:54 +0000 (-0800)
Subject: Merge 3.14-rc4 into char-misc-linus
X-Git-Tag: v3.14-rc5~4^2^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=58e868be77bda526cc8d4264488ed393bc607720;p=~emulex%2Finfiniband.git

Merge 3.14-rc4 into char-misc-linus

Merge this to catch up with the other patches sent upstream.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

58e868be77bda526cc8d4264488ed393bc607720