From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Dec 2009 17:11:28 +0000 (-0800)
Subject: Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: upstream/snapshot3+hdmi~16137
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51b736b85155a56543fda8aeca5f8592795d7983;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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
---

51b736b85155a56543fda8aeca5f8592795d7983