From: Linus Torvalds Date: Sat, 5 Jun 2010 04:12:39 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 X-Git-Tag: upstream/snapshot3+hdmi~14034 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f0d384cafabfbb56663ee6944c18fc0450fc5d6;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: Minix: Clean up left over label fix truncate inode time modification breakage fix setattr error handling in sysfs, configfs fcntl: return -EFAULT if copy_to_user fails wrong type for 'magic' argument in simple_fill_super() fix the deadlock in qib_fs mqueue doesn't need make_bad_inode() --- 7f0d384cafabfbb56663ee6944c18fc0450fc5d6