From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Oct 2010 14:45:10 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: firefly_0821_release~7613^2~3660
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8e775167d54e6521e7cdbc03ee7ec42a8c67b49a;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:
  Revert "block: fix accounting bug on cross partition merges"
---

8e775167d54e6521e7cdbc03ee7ec42a8c67b49a