From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 3 Nov 2009 20:25:45 +0000 (+0100)
Subject: cfq-iosched: fix merge error
X-Git-Tag: v2.6.33-rc1~379^2~74
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=125c4f221a5352ae08aef2898055b879ad963f01;p=pandora-kernel.git

cfq-iosched: fix merge error

We ended up with testing the same condition twice, pretty
pointless. Remove that first if.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

Reading git-diff-tree failed