]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
authorJens Axboe <jens.axboe@oracle.com>
Tue, 4 May 2010 06:48:53 +0000 (08:48 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 4 May 2010 06:48:53 +0000 (08:48 +0200)

Trivial merge