Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
Linus Torvalds [Mon, 25 Oct 2010 14:45:10 +0000 (07:45 -0700)]
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "block: fix accounting bug on cross partition merges"

1  2 
block/blk-core.c

Simple merge