projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bb04af0 febffd6)
Merge branch 'cfq-ioc-share' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jan 2008 21:50:42 +0000 (08:50 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jan 2008 21:50:42 +0000 (08:50 +1100)
commitd4928196fe9ec07d18139ba2735876b0c8aa738f
treea999ee3f18b0d724b2adb15ec72854e7ade164fatree | snapshot
parentbb04af0e2e5bcd8d1a5d7f7d5c704f7eb328f241commit | diff
parentfebffd61816ef6d4f84189468c1d47f1df55921ecommit | diff
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
John Crispins staging tree