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
···318318Who: Len Brown <len.brown@intel.com>319319320320---------------------------321321+322322+What: JFFS (version 1)323323+When: 2.6.21324324+Why: Unmaintained for years, superceded by JFFS2 for years.325325+Who: Jeff Garzik <jeff@garzik.org>326326+327327+---------------------------