Merge branch 'for-upstream' of https://github.com/andyprice/blktrace
authorJens Axboe <axboe@fb.com>
Thu, 25 Sep 2014 21:11:24 +0000 (15:11 -0600)
committerJens Axboe <axboe@fb.com>
Thu, 25 Sep 2014 21:11:24 +0000 (15:11 -0600)
commit558a088d485c530027b369c77de5cd555b6b2cec
tree21b6637033fdec3af023e0a0d11b420a19fc014f
parentf15d76095e46223a70964136a9d13bc274814b8b
parenta92868dc2a78b394a27925991bb7845a68d5c27d
Merge branch 'for-upstream' of https://github.com/andyprice/blktrace

Andrew says:

Here are some trivial tweaks which I found were needed or desirable while
adding iowatcher to the blktrace packaging in Fedora. They improve the
integration of iowatcher into the tree and reduce duplication of docs.