aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-27 07:38:40 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-27 07:38:40 -0800
commit6c1586bc9356855159e5845c6e788aa6db333cb9 (patch)
treed1e1fbafebfa45011d75e1840679d559af16affd
parent01363220f5d23ef68276db8974e46a502e43d01d (diff)
parent6eaf6fc81ab2fa8c264f819f57dc950b6ea9c651 (diff)
Merge branch 'jffs-maint' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'jffs-maint' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: remove the jffs MAINTAINERS entry
-rw-r--r--MAINTAINERS7
1 files changed, 0 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 10054b4078d..06d2087be6b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1906,13 +1906,6 @@ L: isdn4linux@listserv.isdn4linux.de
W: http://www.melware.de
S: Maintained
-JOURNALLING FLASH FILE SYSTEM (JFFS)
-P: Axis Communications AB
-M: jffs-dev@axis.com
-L: jffs-dev@axis.com
-W: http://www.developer.axis.com/software/jffs/
-S: Maintained
-
JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
P: David Woodhouse
M: dwmw2@infradead.org