diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 01:34:57 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 01:34:57 +0100 |
commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /MAINTAINERS | |
parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
parent | Documentation/filesystems/00-INDEX: remove entry for fat_cvf.txt (diff) | |
download | linux-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.tar.xz linux-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3fd7687a6ad9..b524ca363081 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1465,7 +1465,6 @@ P: Several L: kernel-janitors@osdl.org W: http://www.kerneljanitors.org/ W: http://sf.net/projects/kernel-janitor/ -W: http://developer.osdl.org/rddunlap/kj-patches/ S: Maintained KERNEL NFSD @@ -1486,7 +1485,7 @@ KEXEC P: Eric Biederman P: Randy Dunlap M: ebiederm@xmission.com -M: rddunlap@osdl.org +M: rdunlap@xenotime.net W: http://www.xmission.com/~ebiederm/files/kexec/ L: linux-kernel@vger.kernel.org L: fastboot@osdl.org @@ -2587,7 +2586,6 @@ S: Maintained UDF FILESYSTEM P: Ben Fennema M: bfennema@falcon.csc.calpoly.edu -L: linux_udf@hpesjro.fc.hp.com W: http://linux-udf.sourceforge.net S: Maintained |