]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'for-3.2/core' into for-3.2/drivers
authorJens Axboe <jaxboe@fusionio.com>
Tue, 23 Aug 2011 18:01:11 +0000 (20:01 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 23 Aug 2011 18:01:11 +0000 (20:01 +0200)

Trivial merge