Merge branch 'cfq-merge' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 28 Mar 2006 17:25:44 +0000 (09:25 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 28 Mar 2006 17:25:44 +0000 (09:25 -0800)
commit7baf398f12585ae77748716fa77113c1f1831153
tree492361d848d3dfc33563a1bdf0d0f61b454aac82
parent78cd9e04e0acea4f622e84ca0c760c7eae0c6854
parent206dc69b31ca05baac68c75b8ed2ba7dd857d273
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
block/ll_rw_blk.c