Merge branch 'akpm' (patches from Andrew)
[muen/linux.git] / MAINTAINERS
index b6dcaaa23adf1f3c0fa8f76ddff209a3a1b35966..e9336962d0f21fc1840bbb7f2bef774805d4277b 100644 (file)
@@ -199,12 +199,13 @@ F:        drivers/net/ethernet/8390/
 
 9P FILE SYSTEM
 M:     Eric Van Hensbergen <ericvh@gmail.com>
-M:     Ron Minnich <rminnich@sandia.gov>
 M:     Latchesar Ionkov <lucho@ionkov.net>
+M:     Dominique Martinet <asmadeus@codewreck.org>
 L:     v9fs-developer@lists.sourceforge.net
 W:     http://swik.net/v9fs
 Q:     http://patchwork.kernel.org/project/v9fs-devel/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
+T:     git git://github.com/martinetd/linux.git
 S:     Maintained
 F:     Documentation/filesystems/9p.txt
 F:     fs/9p/