Merge branch 'linus' into x86/core
[safe/jmp/linux-2.6] / include / mtd / jffs2-user.h
2008-06-04 Adrian BunkMTD/JFFS2: remove CVS keywords
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2