]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'for-jens' of http://git.drbd.org/linux-2.6-drbd into for-linus
authorJens Axboe <jens.axboe@oracle.com>
Tue, 12 Jan 2010 10:05:11 +0000 (11:05 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 12 Jan 2010 10:05:11 +0000 (11:05 +0100)

Trivial merge