Merge branch 'master' of https://github.com/DevriesL/fio
authorJens Axboe <axboe@kernel.dk>
Tue, 25 May 2021 22:54:13 +0000 (16:54 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 25 May 2021 22:54:13 +0000 (16:54 -0600)
commitc91fd13d479dc38bbb7ef6995256ad098ebbceb2
tree5569031974e74ce5ab270479eec9d5fceace520c
parentb54e0d80c52e626021aacd0ae4d9875940cff9aa
parentd7e3adb683f85e49e078599a08aec7cd7c32d977
Merge branch 'master' of https://github.com/DevriesL/fio

* 'master' of https://github.com/DevriesL/fio:
  android: add support for NDK sharedmem