From: Timothy Manning <tfhmanning@gmail.com>
Date: Thu, 25 Nov 2010 23:34:49 +0000 (+1300)
Subject: Merge branch 'quick_tests'
X-Git-Tag: linux-mainline-patchset-4~52
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=004928b472529f4331c5c80a20cea902e1cdc328

Merge branch 'quick_tests'

Signed-off-by: Timothy Manning <tfhmanning@gmail.com>
---

004928b472529f4331c5c80a20cea902e1cdc328
diff --cc direct/timothy_tests/quick_tests/lib.h
index 09808dd,fdb28fe..f8b6d74
--- a/direct/timothy_tests/quick_tests/lib.h
+++ b/direct/timothy_tests/quick_tests/lib.h
@@@ -20,6 -20,10 +20,7 @@@
  #include <string.h>
  #include "yaffsfs.h"
  
+ 
 -
 -
 -
  #define YAFFS_MOUNT_POINT "/yaffs2/"
  #define FILE_NAME "foo"
  #define FILE_SIZE 10