]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'ipoib' and 'iser' into for-next
authorRoland Dreier <roland@purestorage.com>
Wed, 17 Aug 2011 17:57:43 +0000 (10:57 -0700)
committerRoland Dreier <roland@purestorage.com>
Wed, 17 Aug 2011 17:57:43 +0000 (10:57 -0700)

Trivial merge