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