Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-linus
authorJens Axboe <axboe@kernel.dk>
Wed, 13 Jun 2012 19:19:42 +0000 (21:19 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 13 Jun 2012 19:19:42 +0000 (21:19 +0200)

Trivial merge