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)
* 'master' of https://github.com/DevriesL/fio:
  android: add support for NDK sharedmem


Trivial merge