tree 9c25a602ed764168331823ef86eac6beab950d83
parent 6773f079b72ab0200fe9afa9bb0c656a6af5400c
parent b1404069f64457c94de241738fdca142c2e5698f
author Roland Dreier <rolandd@cisco.com> 1218574374 -0700
committer Roland Dreier <rolandd@cisco.com> 1218574374 -0700

Merge branches 'ehca' and 'ipoib' into for-linus