Merge branch 'kill-jffs-prep' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 19:01:46 +0000 (11:01 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Jan 2007 19:01:46 +0000 (11:01 -0800)
commitb7e72ba03be900a7b2e7b3b02e1bb646dff03c46
tree3013f2d8f10b38ef26e5ef2ea2021e93dbff53e0
parent95543179f158b4891c5dc49004853ce081e8d794
parent54b290a2ecfbfb8613fbf854f9c45667821d9b8d
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