tree 78969a4c8355302cce821475bfe44d5dc69e5d23
parent 22cfb0bf6721bb1f865f67bc21e3c36c272faf36
parent 200ae1a08bec8f3fedfcfe94c892d9a024db4e46
author Roland Dreier <roland@purestorage.com> 1313603863 -0700
committer Roland Dreier <roland@purestorage.com> 1313603863 -0700

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