From: Linus Torvalds Date: Tue, 23 Jan 2007 19:01:46 +0000 (-0800) Subject: Merge branch 'kill-jffs-prep' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Tag: v2.6.20-rc6~27 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b7e72ba03be900a7b2e7b3b02e1bb646dff03c46;p=~shefty%2Frdma-dev.git 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 --- b7e72ba03be900a7b2e7b3b02e1bb646dff03c46