Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Mon, 3 Mar 2014 23:44:57 +0000 (15:44 -0800)
committerJens Axboe <axboe@fb.com>
Mon, 3 Mar 2014 23:44:57 +0000 (15:44 -0800)

Trivial merge