Merge git://git.infradead.org/jffs2-devel-2.6