diff options
author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
commit | ebf572b448757190027d8ee34e73deb989ec7b60 (patch) | |
tree | 2320a92b1aed2c9475e291d75c92616af75e195a /MAINTAINERS | |
parent | 48c86da1a211ef13bbfb1c8f2e35dda44a66b8a1 (diff) | |
parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
download | lwn-ebf572b448757190027d8ee34e73deb989ec7b60.tar.gz lwn-ebf572b448757190027d8ee34e73deb989ec7b60.zip |
Merge branch 'from-linus' into bcm43xx
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4e14ee7f09bf..de443b92540c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -968,6 +968,10 @@ P: Andrey V. Savochkin M: saw@saw.sw.com.sg S: Maintained +EFS FILESYSTEM +W: http://aeschi.ch.eu.org/efs/ +S: Orphan + EMU10K1 SOUND DRIVER P: James Courtier-Dutton M: James@superbug.demon.co.uk @@ -1598,7 +1602,7 @@ W: http://jfs.sourceforge.net/ T: git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git S: Supported -JOURNALLING LAYER FOR BLOCK DEVICS (JBD) +JOURNALLING LAYER FOR BLOCK DEVICES (JBD) P: Stephen Tweedie, Andrew Morton M: sct@redhat.com, akpm@osdl.org L: ext2-devel@lists.sourceforge.net @@ -1642,9 +1646,8 @@ S: Maintained KERNEL JANITORS P: Several -L: kernel-janitors@osdl.org +L: kernel-janitors@lists.osdl.org W: http://www.kerneljanitors.org/ -W: http://sf.net/projects/kernel-janitor/ S: Maintained KERNEL NFSD @@ -1882,6 +1885,12 @@ S: linux-scsi@vger.kernel.org W: http://megaraid.lsilogic.com S: Maintained +MEMORY MANAGEMENT +L: linux-mm@kvack.org +L: linux-kernel@vger.kernel.org +W: http://www.linux-mm.org +S: Maintained + MEMORY TECHNOLOGY DEVICES (MTD) P: David Woodhouse M: dwmw2@infradead.org |