diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-24 00:38:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-24 00:38:21 -0400 |
| commit | 0542170dec523d50e8bed5515e2f7314e738c8d8 (patch) | |
| tree | 4154d3a3a511e1d0cf9b80eaaef5d02f00fd3a04 /MAINTAINERS | |
| parent | 6dc2c1b7798ef645213afc82f6d5eac3d61bc18b (diff) | |
| parent | 02881d94780faa86e32952e46381f7cd4c78d5ac (diff) | |
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-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index abe5fa7f9c33..10a6f57776b2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -167,11 +167,11 @@ S: Maintained | |||
| 167 | P: Eric Van Hensbergen | 167 | P: Eric Van Hensbergen |
| 168 | M: ericvh@gmail.com | 168 | M: ericvh@gmail.com |
| 169 | P: Ron Minnich | 169 | P: Ron Minnich |
| 170 | M: rminnich@lanl.gov | 170 | M: rminnich@sandia.gov |
| 171 | P: Latchesar Ionkov | 171 | P: Latchesar Ionkov |
| 172 | M: lucho@ionkov.net | 172 | M: lucho@ionkov.net |
| 173 | L: v9fs-developer@lists.sourceforge.net | 173 | L: v9fs-developer@lists.sourceforge.net |
| 174 | W: http://v9fs.sf.net | 174 | W: http://swik.net/v9fs |
| 175 | T: git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git | 175 | T: git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git |
| 176 | S: Maintained | 176 | S: Maintained |
| 177 | 177 | ||