Merge branch 'android-26-shm' of https://github.com/omor1/fio
authorJens Axboe <axboe@fb.com>
Mon, 22 May 2017 14:43:38 +0000 (08:43 -0600)
committerJens Axboe <axboe@fb.com>
Mon, 22 May 2017 14:43:38 +0000 (08:43 -0600)

Trivial merge