From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 15 Jul 2007 23:44:53 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh... 
X-Git-Tag: v2.6.23-rc1~1055
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d2a9a8ded48bec153f08ee87a40626c8d0737f79;p=users%2Fjedix%2Flinux-maple.git

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
---

d2a9a8ded48bec153f08ee87a40626c8d0737f79