tree 8dcdbbb7adc68647267794c4e3a4686afd94ad65
parent 8978a318837d7acefca82645017c0534aeba5a36
parent 887b3ece65be7b643dfdae0d433c91a26a3f437d
author Linus Torvalds <torvalds@linux-foundation.org> 1210818613 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210818651 -0700

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

* 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: fix error path during early mount
  9p: make cryptic unknown error from server less scary
  9p: fix flags length in net
  9p: Correct fidpool creation failure in p9_client_create
  9p: use struct mutex instead of struct semaphore
  9p: propagate parse_option changes to client and transports
  fs/9p/v9fs.c (v9fs_parse_options): Handle kstrdup and match_strdup failure.
  9p: Documentation updates
  add match_strlcpy() us it to make v9fs make uname and remotename parsing more robust