integrating recent changes from fermi-test into fermi

(i'll use "fermi" for more disruptive changes to the pipeline model such
as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...)

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805]

1 files changed, 0 insertions, 13 deletions

diff --git a/benchmarks/CUDA/CP/parboil b/benchmarks/CUDA/CP/parboil
deleted file mode 100755
index 3371fc9..0000000
--- a/benchmarks/CUDA/CP/parboil
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /usr/bin/env python
-
-# (c) 2007 The Board of Trustees of the University of Illinois.
-
-import sys
-
-try:
-	import driver
-except ImportError:
-	sys.stderr.write("Cannot run driver.  Are you running it from the parboil root directory?")
-	sys.exit(-1)
-
-driver.run()