]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'master'; commit 'v3.2-rc2' into next
authorJames Morris <jmorris@namei.org>
Wed, 16 Nov 2011 01:39:48 +0000 (12:39 +1100)
committerJames Morris <jmorris@namei.org>
Wed, 16 Nov 2011 01:39:48 +0000 (12:39 +1100)

Trivial merge