Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
authorJens Axboe <jens.axboe@oracle.com>
Mon, 25 Jan 2010 22:15:41 +0000 (23:15 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Mon, 25 Jan 2010 22:15:41 +0000 (23:15 +0100)

Trivial merge