From: Linus Torvalds <torvalds@woody.linux-foundation.org>
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: firefly_0821_release~31502
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b7e72ba03be900a7b2e7b3b02e1bb646dff03c46;p=firefly-linux-kernel-4.4.55.git

Merge branch 'kill-jffs-prep' of /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