Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Wed, 21 Jan 2015 23:57:00 +0000 (00:57 +0100)
committerJens Axboe <axboe@fb.com>
Wed, 21 Jan 2015 23:57:00 +0000 (00:57 +0100)

Trivial merge