Merge branch 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 19 Feb 2007 21:25:36 +0000 (13:25 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 19 Feb 2007 21:25:36 +0000 (13:25 -0800)
commitebbe46f73a11a667df59cb8e58b371c0a35f29d0
treed8063d028d95c77ad15b3ca53ddc0f2c7efbaf25
parent901ea4a07988043ff8c6f4f275ab680a23b8bbcd
parent419ee448ff76aef13526a99c2dc39ba3ae1f0970
Merge branch 'kill-jffs' of /linux/kernel/git/jgarzik/misc-2.6

* 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  Remove JFFS (version 1), as scheduled.
Documentation/feature-removal-schedule.txt