From: Linus Torvalds Date: Tue, 15 Jul 2008 18:03:19 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy... X-Git-Tag: v3.12-rc1~20072 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4e0fadcd929138aa82130a1c5f22206d86d7bb2;p=kernel%2Fkernel-generic.git Merge branch 'for-linus' of git://git./linux/kernel/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: remove DIRENTSIZ JFS: diAlloc() should return -EIO rather than EIO JFS: skip bad iput() call in error path JFS: switch to seq_files JFS: 0 is not valid errno value so return NULL from jfs_lookup --- e4e0fadcd929138aa82130a1c5f22206d86d7bb2