commit 6c1586bc9356855159e5845c6e788aa6db333cb9
author Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Feb 27 07:38:40 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Feb 27 07:38:40 2007 -0800
tree d1e1fbafebfa45011d75e1840679d559af16affd
parent 01363220f5d23ef68276db8974e46a502e43d01d
parent 6eaf6fc81ab2fa8c264f819f57dc950b6ea9c651

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

MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 10054b4..06d2087 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1906,13 +1906,6 @@
 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