Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Oct 2010 14:45:10 +0000 (07:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Oct 2010 14:45:10 +0000 (07:45 -0700)
commit8e775167d54e6521e7cdbc03ee7ec42a8c67b49a
treea49914306fb28505c6e21a456df8bdc40d6eac23
parent4b37ba90f49d4157ac5628f8d730d3505f176724
parentf253b86b4ad1b3220544e75880510fd455ebd23f
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"
block/blk-core.c