Merge branch 'master' of https://github.com/ffontaine/fio
authorJens Axboe <axboe@kernel.dk>
Sat, 23 May 2020 17:13:25 +0000 (11:13 -0600)
committerJens Axboe <axboe@kernel.dk>
Sat, 23 May 2020 17:13:25 +0000 (11:13 -0600)
commit8e6dc0abdfe54a6177bd007dcea97cbb713ba9c0
treef2125f1c22bb12b44dbfbffa4129bdc854da0670
parent1bb1bcade4acbd3cf69ba1c825ad01eebf0b3cdf
parente1985f9097f37748efdc29239eb3fb6a00b12f27
Merge branch 'master' of https://github.com/ffontaine/fio

* 'master' of https://github.com/ffontaine/fio:
  Makefile: fix build of io_uring on sh4