tree e4a90a4f2f65632506e3e04613891cb602843523
parent 2d896c780db9cda5dc102bf7a0a2cd4394c1342e
parent 0af8887ebf4556a76680a61b0bb156d934702c63
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184543093 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184543093 -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 a race condition bug in umount which caused a segfault
  9p: re-enable mount time debug option
  9p: cache meta-data when cache=loose
  net/9p: set error to EREMOTEIO if trans->write returns zero
  net/9p: change net/9p module name to 9pnet
  9p: Reorganization of 9p file system code