]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'cfq' of git://git.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 20 Jul 2007 15:50:49 +0000 (08:50 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 20 Jul 2007 15:50:49 +0000 (08:50 -0700)
* 'cfq' of git://git.kernel.dk/data/git/linux-2.6-block:
  cfq: Write-only stuff in CFQ data structures
  cfq: async queue allocation per priority


Trivial merge