Merge branch 'logging'
authorJens Axboe <axboe@fb.com>
Fri, 6 May 2016 20:04:21 +0000 (14:04 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 6 May 2016 20:04:21 +0000 (14:04 -0600)
1  2 
HOWTO
fio.1

diff --cc HOWTO
Simple merge
diff --cc fio.1
Simple merge