From: Timothy Manning <tfhmanning@gmail.com>
Date: Thu, 25 Nov 2010 23:38:46 +0000 (+1300)
Subject: yaffs fixed some merge issues in direct/timothy_tests/quick_tests
X-Git-Tag: linux-mainline-patchset-4~51
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=3003894b7f0b20840de894a634d047133027e48f;hp=3003894b7f0b20840de894a634d047133027e48f

yaffs fixed some merge issues in direct/timothy_tests/quick_tests
Signed-off-by: Timothy Manning <tfhmanning@gmail.com>
---