From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 28 Mar 2006 17:25:44 +0000 (-0800)
Subject: Merge branch 'cfq-merge' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.17-rc1~208
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7baf398f12585ae77748716fa77113c1f1831153;p=linux-2.6

Merge branch 'cfq-merge' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'cfq-merge' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [BLOCK] cfq-iosched: seek and async performance fixes
  [PATCH] ll_rw_blk: fix 80-col offender in put_io_context()
  [PATCH] cfq-iosched: small cfq_choose_req() optimization
  [PATCH] [BLOCK] cfq-iosched: change cfq io context linking from list to tree
---

7baf398f12585ae77748716fa77113c1f1831153