From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Sep 2010 16:51:54 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: firefly_0821_release~9833^2~424
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=56162badadb91aae93843d8d6558c7d7780e3cb2;p=firefly-linux-kernel-4.4.55.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: prevent merges of discard and write requests
---

56162badadb91aae93843d8d6558c7d7780e3cb2