Merge branch 'driver-refactoring' into new-driver-refactoring

author Charles Manning <cdhmanning@gmail.com>

Tue, 2 Oct 2012 02:41:32 +0000 (15:41 +1300)

committer Charles Manning <cdhmanning@gmail.com>

Tue, 2 Oct 2012 02:41:32 +0000 (15:41 +1300)
author Charles Manning <cdhmanning@gmail.com>
Tue, 2 Oct 2012 02:41:32 +0000 (15:41 +1300)
committer Charles Manning <cdhmanning@gmail.com>
Tue, 2 Oct 2012 02:41:32 +0000 (15:41 +1300)
diff --cc direct/test-framework/basic-tests/dtest.c
Simple merge
diff --cc direct/yaffsfs.c
Simple merge
diff --cc yaffs_guts.c
Simple merge
diff --cc yaffs_guts.h
Simple merge
author	Charles Manning <cdhmanning@gmail.com>
	Tue, 2 Oct 2012 02:41:32 +0000 (15:41 +1300)
committer	Charles Manning <cdhmanning@gmail.com>
	Tue, 2 Oct 2012 02:41:32 +0000 (15:41 +1300)
		1	2
direct/test-framework/basic-tests/dtest.c	patch \|	diff1 \|	diff2 \|	blob \| history
direct/yaffsfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
yaffs_guts.c	patch \|	diff1 \|	diff2 \|	blob \| history
yaffs_guts.h	patch \|	diff1 \|	diff2 \|	blob \| history