Merge branch 'master' of bitbucket.org:psrivas2/visc

llvm/test/VISC/parboil/benchmarks/sgemm/src/opencl_cpu_sm/main.cc

@@ -140,7 +140,7 @@ main (int argc, char *argv[]) {
   
   pb_SetOpenCL(&clContext, &clCommandQueue);
 
-  const char* clSource[] = {readFile("src/opencl_nvidia/kernel.cl")};
+  const char* clSource[] = {readFile("src/opencl_cpu_sm/kernel.cl")};
   cl_program clProgram = clCreateProgramWithSource(clContext,1,clSource,NULL,&clStatus);
   CHECK_ERROR("clCreateProgramWithSource")