tree cc2dd76b8ffc8df4356c1e95bd15276169dd335e
parent 35da7a307c535f9c2929cae277f3df425c9f9b1e
author Jens Axboe <jaxboe@fusionio.com> 1287950762 +0200
committer Jens Axboe <jaxboe@fusionio.com> 1287950762 +0200

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>