Merge branch 'master' of ssh://router.home.kernel.dk/data/git/blktrace
authorJens Axboe <jens.axboe@oracle.com>
Mon, 19 Apr 2010 17:15:27 +0000 (19:15 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Mon, 19 Apr 2010 17:15:27 +0000 (19:15 +0200)

Trivial merge