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

Trivial merge