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

Trivial merge