Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
authorJens Axboe <jens.axboe@oracle.com>
Thu, 31 Dec 2009 09:00:27 +0000 (10:00 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 31 Dec 2009 09:00:27 +0000 (10:00 +0100)

Trivial merge