aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-23 11:01:46 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-23 11:01:46 -0800
commitb7e72ba03be900a7b2e7b3b02e1bb646dff03c46 (patch)
tree3013f2d8f10b38ef26e5ef2ea2021e93dbff53e0
parent95543179f158b4891c5dc49004853ce081e8d794 (diff)
parent54b290a2ecfbfb8613fbf854f9c45667821d9b8d (diff)
downloadmrst-s0i3-test-b7e72ba03be900a7b2e7b3b02e1bb646dff03c46.tar.gz
mrst-s0i3-test-b7e72ba03be900a7b2e7b3b02e1bb646dff03c46.tar.xz
mrst-s0i3-test-b7e72ba03be900a7b2e7b3b02e1bb646dff03c46.zip
Merge branch 'kill-jffs-prep' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'kill-jffs-prep' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: Note that JFFS (v1) is to be deleted, in feature-removal-schedule.txt
-rw-r--r--Documentation/feature-removal-schedule.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index fc532395d11..0ba6af02cda 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -318,3 +318,10 @@ Why: /proc/acpi/button has been replaced by events to the input layer
Who: Len Brown <len.brown@intel.com>
---------------------------
+
+What: JFFS (version 1)
+When: 2.6.21
+Why: Unmaintained for years, superceded by JFFS2 for years.
+Who: Jeff Garzik <jeff@garzik.org>
+
+---------------------------