Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Nov 2011 20:10:47 +0000 (12:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Nov 2011 20:10:47 +0000 (12:10 -0800)
* '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


Trivial merge