Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Mon, 30 Jul 2012 14:47:27 +0000 (07:47 -0700)
committerRoland Dreier <roland@purestorage.com>
Mon, 30 Jul 2012 14:47:27 +0000 (07:47 -0700)
commit1da9b6b43e31a5d88a82cc70b8f57090c9dd2be8
tree87507a57458c7f8ab4a6fe3ae703420c70a997f9
parent0764c76ecb06987749bce49657e473e6605f09c4
parentb63b70d8774175b6f8393c495fe455f0fba55ce1
parent9e8fa040cb2d9070d15d3f0d71b83e85e32ecde2
parent5d7fe4efbf0878e0ef12c8f93e7a16c750494b7e
Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next