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

parents 95543179 54b290a2

Documentation/feature-removal-schedule.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -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>

		---------------------------