Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

author Charles Manning <cdhmanning@gmail.com>

Thu, 11 Jul 2013 05:46:25 +0000 (17:46 +1200)

committer Charles Manning <cdhmanning@gmail.com>

Thu, 11 Jul 2013 05:46:25 +0000 (17:46 +1200)
author Charles Manning <cdhmanning@gmail.com>
Thu, 11 Jul 2013 05:46:25 +0000 (17:46 +1200)
committer Charles Manning <cdhmanning@gmail.com>
Thu, 11 Jul 2013 05:46:25 +0000 (17:46 +1200)
diff --cc yaffs_guts.c
Simple merge
diff --cc yaffs_guts.h
Simple merge
diff --cc yaffs_vfs_multi.c
Simple merge
author	Charles Manning <cdhmanning@gmail.com>
	Thu, 11 Jul 2013 05:46:25 +0000 (17:46 +1200)
committer	Charles Manning <cdhmanning@gmail.com>
	Thu, 11 Jul 2013 05:46:25 +0000 (17:46 +1200)
		1	2
yaffs_guts.c	patch \|	diff1 \|	diff2 \|	blob \| history
yaffs_guts.h	patch \|	diff1 \|	diff2 \|	blob \| history
yaffs_vfs_multi.c	patch \|	diff1 \|	diff2 \|	blob \| history