Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
authorJens Axboe <jens.axboe@oracle.com>
Mon, 21 Dec 2009 18:16:38 +0000 (19:16 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Mon, 21 Dec 2009 18:16:38 +0000 (19:16 +0100)

Trivial merge