Merge branch 'master' of ssh://router/data/git/blktrace
authorJens Axboe <axboe@ml370.home.kernel.dk>
Mon, 16 Jan 2006 14:42:58 +0000 (15:42 +0100)
committerJens Axboe <axboe@ml370.home.kernel.dk>
Mon, 16 Jan 2006 14:42:58 +0000 (15:42 +0100)

Trivial merge