Merge branch 'mtd/yaffs_test'