From: Linus Torvalds Date: Mon, 21 Nov 2011 20:10:47 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7758c4d6e9371efa04a1cf1b124bbf9cc43e830e;p=deliverable%2Flinux.git Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: VFS: Log the fact that we've given ELOOP rather than creating a loop minixfs: kill manual hweight(), simplify fs/minix: Verify bitmap block counts before mounting --- 7758c4d6e9371efa04a1cf1b124bbf9cc43e830e