Merge branches 'ipoib' and 'iser' into for-next
commit80b43de83781ed67810d54c7892ac9cb2a2601df
authorRoland Dreier <roland@purestorage.com>
Wed, 17 Aug 2011 17:57:43 +0000 (17 10:57 -0700)
committerRoland Dreier <roland@purestorage.com>
Wed, 17 Aug 2011 17:57:43 +0000 (17 10:57 -0700)
tree78969a4c8355302cce821475bfe44d5dc69e5d23
parent22cfb0bf6721bb1f865f67bc21e3c36c272faf36
parent200ae1a08bec8f3fedfcfe94c892d9a024db4e46
Merge branches 'ipoib' and 'iser' into for-next