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)

Trivial merge