diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 14:01:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 14:01:46 -0500 |
commit | b7e72ba03be900a7b2e7b3b02e1bb646dff03c46 (patch) | |
tree | 3013f2d8f10b38ef26e5ef2ea2021e93dbff53e0 /security | |
parent | 95543179f158b4891c5dc49004853ce081e8d794 (diff) | |
parent | 54b290a2ecfbfb8613fbf854f9c45667821d9b8d (diff) |
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
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions