diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /MAINTAINERS | |
parent | 1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (diff) | |
parent | 48d727a9f93e617d6d443507acf7d1b849c63366 (diff) |
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 | |||
1465 | L: kernel-janitors@osdl.org | 1465 | L: kernel-janitors@osdl.org |
1466 | W: http://www.kerneljanitors.org/ | 1466 | W: http://www.kerneljanitors.org/ |
1467 | W: http://sf.net/projects/kernel-janitor/ | 1467 | W: http://sf.net/projects/kernel-janitor/ |
1468 | W: http://developer.osdl.org/rddunlap/kj-patches/ | ||
1469 | S: Maintained | 1468 | S: Maintained |
1470 | 1469 | ||
1471 | KERNEL NFSD | 1470 | KERNEL NFSD |
@@ -1486,7 +1485,7 @@ KEXEC | |||
1486 | P: Eric Biederman | 1485 | P: Eric Biederman |
1487 | P: Randy Dunlap | 1486 | P: Randy Dunlap |
1488 | M: ebiederm@xmission.com | 1487 | M: ebiederm@xmission.com |
1489 | M: rddunlap@osdl.org | 1488 | M: rdunlap@xenotime.net |
1490 | W: http://www.xmission.com/~ebiederm/files/kexec/ | 1489 | W: http://www.xmission.com/~ebiederm/files/kexec/ |
1491 | L: linux-kernel@vger.kernel.org | 1490 | L: linux-kernel@vger.kernel.org |
1492 | L: fastboot@osdl.org | 1491 | L: fastboot@osdl.org |
@@ -2587,7 +2586,6 @@ S: Maintained | |||
2587 | UDF FILESYSTEM | 2586 | UDF FILESYSTEM |
2588 | P: Ben Fennema | 2587 | P: Ben Fennema |
2589 | M: bfennema@falcon.csc.calpoly.edu | 2588 | M: bfennema@falcon.csc.calpoly.edu |
2590 | L: linux_udf@hpesjro.fc.hp.com | ||
2591 | W: http://linux-udf.sourceforge.net | 2589 | W: http://linux-udf.sourceforge.net |
2592 | S: Maintained | 2590 | S: Maintained |
2593 | 2591 | ||