tree 86792764365ca7b40a21e5eb8fc4f7b355088535
parent c28f3f8660697d03afbdb581781b94ff6222a585
parent 684bdc7ff95e0c1d4b0bcf236491840b55a54189
author Linus Torvalds <torvalds@linux-foundation.org> 1273939395 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1273939395 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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