X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=MAINTAINERS;h=06d2087be6bf275fdb11a4bc563e8f48910bd08b;hb=6eaf6fc81ab2fa8c264f819f57dc950b6ea9c651;hp=a9c13196f6bdd054099f5259e0d82b6c7bf05e1e;hpb=d0374f4f9c35cdfbee0ade72d06732613b4e6628;p=linux-2.6

diff --git a/MAINTAINERS b/MAINTAINERS
index a9c13196f6..06d2087be6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1494,6 +1494,12 @@ M:	jkosina@suse.cz
 L:	linux-input@atrey.karlin.mff.cuni.cz
 S:	Maintained
 
+HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
+P:	Thomas Gleixner
+M:	tglx@linutronix.de
+L:	linux-kernel@vger.kernel.org
+S:	Maintained
+
 HIGH-SPEED SCC DRIVER FOR AX.25
 P:	Klaus Kudielka
 M:	klaus.kudielka@ieee.org
@@ -1900,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