From: Jens Axboe <axboe@fb.com>
Date: Mon, 22 May 2017 14:43:38 +0000 (-0600)
Subject: Merge branch 'android-26-shm' of https://github.com/omor1/fio
X-Git-Tag: fio-2.21~50
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=62720129955be364c937534fe98024403ce5ba19;hp=-c;p=fio.git

Merge branch 'android-26-shm' of https://github.com/omor1/fio
---

62720129955be364c937534fe98024403ce5ba19