aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-17 17:41:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-17 17:41:19 -0700
commit77aa56ba09b7416764aec2e3f7b41e023cf30602 (patch)
treed4247c8ee6b7371e60dcadaf1540c943ed7a9801 /arch
parentMerge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff)
parentMerge branch 'for_next' into for_linus (diff)
downloadlinux-dev-77aa56ba09b7416764aec2e3f7b41e023cf30602.tar.xz
linux-dev-77aa56ba09b7416764aec2e3f7b41e023cf30602.zip
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: ext3: Always set dx_node's fake_dirent explicitly. ext3: Fix an overflow in ext3_trim_fs. jbd: Remove one to many n's in a word. ext3: skip orphan cleanup on rocompat fs ext2: Fix link count corruption under heavy link+rename load ext3: speed up group trim with the right free block count. ext3: Adjust trim start with first_data_block. quota: return -ENOMEM when memory allocation fails
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions