tree 937c8be978bf66084128cd62fca3e94fa50c3f36
parent a8aa1ebdf880ebe7b5738ccebf67e18d62cbdc0b
parent 66ae291978177d5c012015f12b8fbc76dc7d0965
author Linus Torvalds <torvalds@linux-foundation.org> 1260897088 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260897088 -0800

Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block:
  cfq: set workload as expired if it doesn't have any slice left
  Fix a CFQ crash in "for-2.6.33" branch of block tree
  cfq: Remove wait_request flag when idle time is being deleted
  cfq-iosched: commenting non-obvious initialization
  cfq-iosched: Take care of corner cases of group losing share due to deletion
  cfq-iosched: Get rid of cfqq wait_busy_done flag
  cfq: Optimization for close cooperating queue searching
  block,xd: Delay allocation of DMA buffers until device is known
  drbd: Following the hmac change to SHASH (see linux commit 8bd1209cfff)
  cfq-iosched: reduce write depth only if sync was delayed