summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-23 21:38:21 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-23 21:38:21 -0700
commit0542170dec523d50e8bed5515e2f7314e738c8d8 (patch)
tree4154d3a3a511e1d0cf9b80eaaef5d02f00fd3a04 /MAINTAINERS
parent6dc2c1b7798ef645213afc82f6d5eac3d61bc18b (diff)
parent02881d94780faa86e32952e46381f7cd4c78d5ac (diff)
downloadlinux-3.10-0542170dec523d50e8bed5515e2f7314e738c8d8.tar.gz
linux-3.10-0542170dec523d50e8bed5515e2f7314e738c8d8.tar.bz2
linux-3.10-0542170dec523d50e8bed5515e2f7314e738c8d8.zip
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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index abe5fa7f9c3..10a6f57776b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -167,11 +167,11 @@ S: Maintained
P: Eric Van Hensbergen
M: ericvh@gmail.com
P: Ron Minnich
-M: rminnich@lanl.gov
+M: rminnich@sandia.gov
P: Latchesar Ionkov
M: lucho@ionkov.net
L: v9fs-developer@lists.sourceforge.net
-W: http://v9fs.sf.net
+W: http://swik.net/v9fs
T: git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git
S: Maintained