Merge branches 'ehca' and 'ipoib' into for-linus
commit3a3eae0d66591572f771b9383e96ecacacee0abd
authorRoland Dreier <rolandd@cisco.com>
Tue, 12 Aug 2008 20:52:54 +0000 (12 13:52 -0700)
committerRoland Dreier <rolandd@cisco.com>
Tue, 12 Aug 2008 20:52:54 +0000 (12 13:52 -0700)
tree9c25a602ed764168331823ef86eac6beab950d83
parent6773f079b72ab0200fe9afa9bb0c656a6af5400c
parentb1404069f64457c94de241738fdca142c2e5698f
Merge branches 'ehca' and 'ipoib' into for-linus