tree 742e5b26440ef2c253d543a2b0a4bed8d3496f1e
parent fb478da5ba69ecf40729ae8ab37ca406b1e5be48
parent 16ec4700127d479143c77fd9128dfa17ab572963
author Linus Torvalds <torvalds@linux-foundation.org> 1222295630 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1222295630 -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: fix put_data error handling
  9p: use an IS_ERR test rather than a NULL test
  9p: introduce missing kfree
  9p-trans_fd: fix and clean up module init/exit paths
  9p-trans_fd: don't do fs segment mangling in p9_fd_poll()
  9p-trans_fd: clean up p9_conn_create()
  9p-trans_fd: fix trans_fd::p9_conn_destroy()
  9p: implement proper trans module refcounting and unregistration