tree 39cd85f0f5966ed8c501740359b1d03d48f5ea41
parent dc113c1f1d4b47af1b1ca701c5a39e24d296c2ac
parent 1a102ff92579edeff5e3d5d3c76ca49977898f00
author Linus Torvalds <torvalds@linux-foundation.org> 1300327797 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300327797 -0700

Merge branch 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  vfs: bury ->get_sb()
  nfs: switch NFS from ->get_sb() to ->mount()
  nfs: stop mangling ->mnt_devname on NFS
  vfs: new superblock methods to override /proc/*/mount{s,info}
  nfs: nfs_do_{ref,sub}mount() superblock argument is redundant
  nfs: make nfs_path() work without vfsmount
  nfs: store devname at disconnected NFS roots
  nfs: propagate devname to nfs{,4}_get_root()