From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 24 Aug 2007 04:38:21 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh... 
X-Git-Tag: v2.6.23-rc4~25
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0542170dec523d50e8bed5515e2f7314e738c8d8;p=linux-2.6

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 bad error path in conversion routines
  9p: remove deprecated v9fs_fid_lookup_remove()
  9p: update maintainers and documentation
  9p: fix use after free
---

0542170dec523d50e8bed5515e2f7314e738c8d8