Merge branch 'shm_rm' of https://github.com/sitsofe/fio
authorJens Axboe <axboe@fb.com>
Thu, 26 Jan 2017 17:07:48 +0000 (10:07 -0700)
committerJens Axboe <axboe@fb.com>
Thu, 26 Jan 2017 17:07:48 +0000 (10:07 -0700)
commitf0ac17190989b4ada1d4d74be8d7a4ef3a76dfbb
tree5a2915a4863da0ae5479c75fe65446fb7a2987d9
parent861e3790be5f1e22b16e827b142147e530205441
parent97900ebfb0192130823dce8aa8f36916313a1c18
Merge branch 'shm_rm' of https://github.com/sitsofe/fio