From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Jun 2011 17:21:59 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Tag: v3.0-rc4~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8dac6bee32425dd5145b40fa2307648cb7fb4d4a;p=platform%2Fkernel%2Flinux-exynos.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:
  AFS: Use i_generation not i_version for the vnode uniquifier
  AFS: Set s_id in the superblock to the volume name
  vfs: Fix data corruption after failed write in __block_write_begin()
  afs: afs_fill_page reads too much, or wrong data
  VFS: Fix vfsmount overput on simultaneous automount
  fix wrong iput on d_inode introduced by e6bc45d65d
  Delay struct net freeing while there's a sysfs instance refering to it
  afs: fix sget() races, close leak on umount
  ubifs: fix sget races
  ubifs: split allocation of ubifs_info into a separate function
  fix leak in proc_set_super()
---

8dac6bee32425dd5145b40fa2307648cb7fb4d4a