From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Dec 2009 18:34:42 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: upstream/snapshot3+hdmi~16119
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ac4d630eb87656bd4dc313b910776d54d88ea28;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:
  block: temporarily disable discard granularity
---

5ac4d630eb87656bd4dc313b910776d54d88ea28