tree 2edd0fb64549dfb6388e39d86e8965908dfcb925
parent 788d908f2879a17e5f80924f3da2e23f1034482d
parent 7815f4be4026b6c5027058102ae67a4b9feffa5f
author Linus Torvalds <torvalds@linux-foundation.org> 1251401048 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1251401048 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: update documentation pointers
  9p: remove unnecessary v9fses->options which duplicates the mount string
  net/9p: insulate the client against an invalid error code sent by a 9p server
  9p: Add missing cast for the error return value in v9fs_get_inode
  9p: Remove redundant inode uid/gid assignment
  9p: Fix possible regressions when ->get_sb fails.
  9p: Fix v9fs show_options
  9p: Fix possible memleak in v9fs_inode_from fid.
  9p: minor comment fixes
  9p: Fix possible inode leak in v9fs_get_inode.
  9p: Check for error in return value of v9fs_fid_add