From: Roland Dreier <roland@purestorage.com>
Date: Tue, 3 Feb 2015 17:29:25 +0000 (-0800)
Subject: Merge branches 'ipoib' and 'odp' into for-next
X-Git-Tag: firefly_0821_release~176^2~2429^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ecb7b1233c532c60fa7a8927a43944e69f6e6b1a;p=firefly-linux-kernel-4.4.55.git

Merge branches 'ipoib' and 'odp' into for-next
---

ecb7b1233c532c60fa7a8927a43944e69f6e6b1a