Merge remote branch 'cros/upstream' into tempbranch

client/samples/parallel_dd

Index: client/samples/parallel_dd
diff --git a/client/samples/parallel_dd b/client/samples/parallel_dd
deleted file mode 100644
index 57e712b142e26ae170bf55663107fb0ba4d9a7af..0000000000000000000000000000000000000000
--- a/client/samples/parallel_dd
+++ /dev/null
@@ -1,22 +0,0 @@
-def tests(tag):
-	fs = job.filesystem('/dev/sda3', job.tmpdir)
-	job.run_test('parallel_dd', fs=fs, fs_type='ext2', iterations=1, megabytes=1000, streams=2, tag=tag)
-
-def step_init():
-	testkernel = job.kernel('/usr/src/linux-2.6.18.tar.bz2')
-	testkernel.config('/usr/src/config')
-	testkernel.build()
-	job.next_step([step_one])
-	testkernel.boot()
-
-def step_one():
-	tests('mainline')
-	testkernel = job.kernel('/usr/src/linux-2.6.18.tar.bz2')
-	testkernel.patch('/usr/src/ext2_reservations')
-	testkernel.config('/usr/src/config')
-	testkernel.build()
-	job.next_step([step_two])
-	testkernel.boot()
-
-def step_two():
-	tests('extents')