From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jan 2008 21:50:42 +0000 (+1100)
Subject: Merge branch 'cfq-ioc-share' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.25-rc1~1174
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d4928196fe9ec07d18139ba2735876b0c8aa738f;p=linux-2.6-block.git

Merge branch 'cfq-ioc-share' of git://git.kernel.dk/linux-2.6-block

* 'cfq-ioc-share' of git://git.kernel.dk/linux-2.6-block:
  cfq-iosched: kill some big inlines
  cfq-iosched: relax IOPRIO_CLASS_IDLE restrictions
  kernel: add CLONE_IO to specifically request sharing of IO contexts
  io_context sharing - anticipatory changes
  block: cfq: make the io contect sharing lockless
  io_context sharing - cfq changes
  io context sharing: preliminary support
  ioprio: move io priority from task_struct to io_context
---

d4928196fe9ec07d18139ba2735876b0c8aa738f