From: Linus Torvalds Date: Thu, 19 Jan 2012 22:49:16 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e19c29e8d8d3b2dbc4c9a859f40c3f95ed089441;p=~shefty%2Frdma-dev.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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 --- e19c29e8d8d3b2dbc4c9a859f40c3f95ed089441