From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Jul 2009 21:29:58 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: upstream/snapshot3+hdmi~18123
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69ca06c9454169c4a9303e8834adae9080f94859;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  cfq-iosched: reset oom_cfqq in cfq_set_request()
  block: fix sg SG_DXFER_TO_FROM_DEV regression
  block: call blk_scsi_ioctl_init()
  Fix congestion_wait() sync/async vs read/write confusion
---

69ca06c9454169c4a9303e8834adae9080f94859