Merge branch 'master' of https://github.com/davidzengxhsh/fio
authorJens Axboe <axboe@fb.com>
Fri, 20 May 2016 17:22:37 +0000 (11:22 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 20 May 2016 17:22:37 +0000 (11:22 -0600)
1  2 
Makefile

diff --cc Makefile
Simple merge