Merge JFFS2 updates from David Woodhouse