Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-linus
authorJens Axboe <axboe@kernel.dk>
Thu, 16 Aug 2012 17:27:18 +0000 (19:27 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 16 Aug 2012 17:27:18 +0000 (19:27 +0200)

Trivial merge