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)
commitecb7b1233c532c60fa7a8927a43944e69f6e6b1a
tree095b671c774ac9e820def16f8d159ee361fa767e
parent4143a9515d355857aeaa151a63cf21dd061151d9
parent7e36ef8205fffc9aedd1f3db38d15e37753df721
Merge branches 'ipoib' and 'odp' into for-next