summary refs log tree commit diff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-16 19:09:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-16 19:09:57 -0700
commit054cfaacf88865bff1dd58d305443d5d6c068a08 (patch)
tree39cd85f0f5966ed8c501740359b1d03d48f5ea41 /net
parentdc113c1f1d4b47af1b1ca701c5a39e24d296c2ac (diff)
parent1a102ff92579edeff5e3d5d3c76ca49977898f00 (diff)
downloadlinux-054cfaacf88865bff1dd58d305443d5d6c068a08.tar.gz
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()
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions