Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Wed, 12 Mar 2014 16:50:29 +0000 (10:50 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 12 Mar 2014 16:50:29 +0000 (10:50 -0600)

Trivial merge