Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@kernel.dk>
Fri, 24 May 2013 18:11:02 +0000 (20:11 +0200)
committerJens Axboe <axboe@kernel.dk>
Fri, 24 May 2013 18:11:02 +0000 (20:11 +0200)

Trivial merge