aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 19:34:57 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 19:34:57 -0500
commit52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch)
treed956016f7aefff1030ca0f7885ac6a6f890a9e94 /MAINTAINERS
parent1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (diff)
parent48d727a9f93e617d6d443507acf7d1b849c63366 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
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
1465L: kernel-janitors@osdl.org 1465L: kernel-janitors@osdl.org
1466W: http://www.kerneljanitors.org/ 1466W: http://www.kerneljanitors.org/
1467W: http://sf.net/projects/kernel-janitor/ 1467W: http://sf.net/projects/kernel-janitor/
1468W: http://developer.osdl.org/rddunlap/kj-patches/
1469S: Maintained 1468S: Maintained
1470 1469
1471KERNEL NFSD 1470KERNEL NFSD
@@ -1486,7 +1485,7 @@ KEXEC
1486P: Eric Biederman 1485P: Eric Biederman
1487P: Randy Dunlap 1486P: Randy Dunlap
1488M: ebiederm@xmission.com 1487M: ebiederm@xmission.com
1489M: rddunlap@osdl.org 1488M: rdunlap@xenotime.net
1490W: http://www.xmission.com/~ebiederm/files/kexec/ 1489W: http://www.xmission.com/~ebiederm/files/kexec/
1491L: linux-kernel@vger.kernel.org 1490L: linux-kernel@vger.kernel.org
1492L: fastboot@osdl.org 1491L: fastboot@osdl.org
@@ -2587,7 +2586,6 @@ S: Maintained
2587UDF FILESYSTEM 2586UDF FILESYSTEM
2588P: Ben Fennema 2587P: Ben Fennema
2589M: bfennema@falcon.csc.calpoly.edu 2588M: bfennema@falcon.csc.calpoly.edu
2590L: linux_udf@hpesjro.fc.hp.com
2591W: http://linux-udf.sourceforge.net 2589W: http://linux-udf.sourceforge.net
2592S: Maintained 2590S: Maintained
2593 2591