summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 01:42:22 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 01:42:22 +0200
commit49302d0c42592b37f49ae96e0f06a3599cf5a8a0 (patch)
treef733a7229cd3d62b5a19a2cbbceea1118c31f237 /kernel
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentJFS: Fix i_blocks accounting when allocation fails (diff)
downloadlinux-49302d0c42592b37f49ae96e0f06a3599cf5a8a0.tar.xz
linux-49302d0c42592b37f49ae96e0f06a3599cf5a8a0.zip
Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions