Merge branches 'ipoib' and 'odp' into for-next
authorRoland Dreier <roland@purestorage.com>
Tue, 3 Feb 2015 17:29:25 +0000 (09:29 -0800)
committerRoland Dreier <roland@purestorage.com>
Tue, 3 Feb 2015 17:29:25 +0000 (09:29 -0800)

Trivial merge