Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace
authorJens Axboe <jens.axboe@oracle.com>
Tue, 1 Sep 2009 08:24:24 +0000 (10:24 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 1 Sep 2009 08:24:24 +0000 (10:24 +0200)

Trivial merge