Merge branch 'master' of ssh://router/data/git/blktrace
authorJens Axboe <axboe@ml370.home.kernel.dk>
Thu, 12 Jan 2006 17:58:33 +0000 (18:58 +0100)
committerJens Axboe <axboe@ml370.home.kernel.dk>
Thu, 12 Jan 2006 17:58:33 +0000 (18:58 +0100)

Trivial merge