Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 May 2010 16:03:15 +0000 (09:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 May 2010 16:03:15 +0000 (09:03 -0700)
commit3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f
tree86792764365ca7b40a21e5eb8fc4f7b355088535
parentc28f3f8660697d03afbdb581781b94ff6222a585
parent684bdc7ff95e0c1d4b0bcf236491840b55a54189
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:
  JFS: Free sbi memory in error path
  fs/sysv: dereferencing ERR_PTR()
  Fix double-free in logfs
  Fix the regression created by "set S_DEAD on unlink()..." commit