]> git.openfabrics.org - ~shefty/libibverbs.git/commitdiff
Merge branches 'stable' and 'stable-1.0' into stable
authorRoland Dreier <rolandd@cisco.com>
Thu, 12 Apr 2007 21:36:23 +0000 (14:36 -0700)
committerRoland Dreier <rolandd@cisco.com>
Thu, 12 Apr 2007 21:36:23 +0000 (14:36 -0700)

Trivial merge