From: Jens Axboe <axboe@fb.com>
Date: Thu, 25 Sep 2014 21:11:24 +0000 (-0600)
Subject: Merge branch 'for-upstream' of https://github.com/andyprice/blktrace
X-Git-Tag: blktrace-1.2.0~28
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=558a088d485c530027b369c77de5cd555b6b2cec;p=blktrace.git

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.
---

558a088d485c530027b369c77de5cd555b6b2cec