From: Doug Ledford <dledford@redhat.com>
Date: Wed, 15 Apr 2015 20:24:49 +0000 (-0400)
Subject: Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into... 
X-Git-Tag: firefly_0821_release~176^2~1881^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf;p=firefly-linux-kernel-4.4.55.git

Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into for-4.1
---

c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf