| commit | ecb7b1233c532c60fa7a8927a43944e69f6e6b1a | [log] [tgz] |
|---|---|---|
| author | Roland Dreier <roland@purestorage.com> | Tue Feb 03 09:29:25 2015 -0800 |
| committer | Roland Dreier <roland@purestorage.com> | Tue Feb 03 09:29:25 2015 -0800 |
| tree | 095b671c774ac9e820def16f8d159ee361fa767e | |
| parent | 4143a9515d355857aeaa151a63cf21dd061151d9 [diff] | |
| parent | 7e36ef8205fffc9aedd1f3db38d15e37753df721 [diff] |
Merge branches 'ipoib' and 'odp' into for-next