From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 May 2010 16:03:15 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Tag: v2.6.34~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f;p=platform%2Fkernel%2Flinux-stable.git

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
---

3f8bf8f0fd79410fbcbf9dd9910dbc9d4882c94f