From: Shaohua Li <shli@fusionio.com>
Date: Thu, 9 Aug 2012 13:20:23 +0000 (+0200)
Subject: block: disable discard request merge temporarily
X-Git-Tag: v3.6-rc4~18^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=276f0f5d157bb4a816053f4f3a941dbcd4f76556;p=pandora-kernel.git

block: disable discard request merge temporarily

The SCSI discard request merge never worked, and looks no solution
for in future, let's disable it temporarily.

Signed-off-by: Shaohua Li <shli@fusionio.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

Reading git-diff-tree failed