summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 16:45:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 16:45:10 +0200
commit8e775167d54e6521e7cdbc03ee7ec42a8c67b49a (patch)
treea49914306fb28505c6e21a456df8bdc40d6eac23 /arch
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ger... (diff)
parentRevert "block: fix accounting bug on cross partition merges" (diff)
downloadlinux-8e775167d54e6521e7cdbc03ee7ec42a8c67b49a.tar.xz
linux-8e775167d54e6521e7cdbc03ee7ec42a8c67b49a.zip
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"
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions