tree b15931691edab2fb4e5465c3c14a4f159c8f25e4
parent 2658770b2c3570106675d2e5581f4ae727523e0a
parent 55762690e2696d7b5034d85d1fbeb620841220c9
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1194364426 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1194364426 -0800

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: add missing end-of-options record for trans_fd
  9p: return NULL when trans not found
  9p: use copy of the options value instead of original
  9p: fix memory leak in v9fs_get_sb