Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 24 Aug 2007 04:38:21 +0000 (21:38 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 24 Aug 2007 04:38:21 +0000 (21:38 -0700)
commit0542170dec523d50e8bed5515e2f7314e738c8d8
tree4154d3a3a511e1d0cf9b80eaaef5d02f00fd3a04
parent6dc2c1b7798ef645213afc82f6d5eac3d61bc18b
parent02881d94780faa86e32952e46381f7cd4c78d5ac
Merge branch 'for-linus' of git://git./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
MAINTAINERS