Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-linus
authorJens Axboe <axboe@kernel.dk>
Tue, 22 Jan 2013 15:22:11 +0000 (08:22 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 22 Jan 2013 15:22:11 +0000 (08:22 -0700)

Trivial merge