Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@kernel.dk>
Fri, 17 May 2013 10:41:22 +0000 (12:41 +0200)
committerJens Axboe <axboe@kernel.dk>
Fri, 17 May 2013 10:41:22 +0000 (12:41 +0200)

Trivial merge