From: Jens Axboe <jaxboe@fusionio.com>
Date: Sun, 24 Oct 2010 20:06:02 +0000 (+0200)
Subject: Revert "block: fix accounting bug on cross partition merges"
X-Git-Tag: v2.6.37-rc1~137^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f253b86b4ad1b3220544e75880510fd455ebd23f;p=pandora-kernel.git

Revert "block: fix accounting bug on cross partition merges"

This reverts commit 7681bfeeccff5efa9eb29bf09249a3c400b15327.

Conflicts:

	include/linux/genhd.h

It has numerous issues with the cleanup path and non-elevator
devices. Revert it for now so we can come up with a clean
version without rushing things.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

Reading git-diff-tree failed