Merge branch 'master' of ssh://brick.kernel.dk/data/git/blktrace
authorJens Axboe <axboe@kernel.dk>
Tue, 31 Jan 2012 09:52:25 +0000 (10:52 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 31 Jan 2012 09:52:25 +0000 (10:52 +0100)

Trivial merge