Merge branches 'ipath' and 'ipoib' into for-linus
authorRoland Dreier <rolandd@cisco.com>
Tue, 19 Aug 2008 22:01:45 +0000 (15:01 -0700)
committerRoland Dreier <rolandd@cisco.com>
Tue, 19 Aug 2008 22:01:45 +0000 (15:01 -0700)

Trivial merge