tree 492361d848d3dfc33563a1bdf0d0f61b454aac82
parent 78cd9e04e0acea4f622e84ca0c760c7eae0c6854
parent 206dc69b31ca05baac68c75b8ed2ba7dd857d273
author Linus Torvalds <torvalds@g5.osdl.org> 1143566744 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143566744 -0800

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