Merge branch 'cfq' into for-linus
authorJens Axboe <axboe@nelson.home.kernel.dk>
Mon, 30 Apr 2007 07:09:27 +0000 (09:09 +0200)
committerJens Axboe <axboe@nelson.home.kernel.dk>
Mon, 30 Apr 2007 07:09:27 +0000 (09:09 +0200)

Trivial merge