Merge branch 'master' of https://github.com/majianpeng/fio
authorJens Axboe <axboe@kernel.dk>
Tue, 15 May 2018 01:40:32 +0000 (19:40 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 15 May 2018 01:40:32 +0000 (19:40 -0600)
* 'master' of https://github.com/majianpeng/fio:
  This partly revert 97bb54c9606c(add __load_ioengine() to separate ioengine loading from td context)


Trivial merge