Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jan 2012 22:49:16 +0000 (14:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Jan 2012 22:49:16 +0000 (14:49 -0800)
commite19c29e8d8d3b2dbc4c9a859f40c3f95ed089441
tree9fb1d7c2973bbcae7632d4380868ef8c9ce40713
parentafd290945cd283030b51b433a66fe57a8feb28c8
parent8bc5191b261c4fd9a5e9052cebe04ce2ef05f2e7
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:
  qnx4: don't leak ->BitMap on late failure exits
  qnx4: reduce the insane nesting in qnx4_checkroot()
  qnx4: di_fname is an array, for crying out loud...
  vfs: remove printk from set_nlink()
  wake up s_wait_unfrozen when ->freeze_fs fails