Merge commit '69983b7' into bfgminer

Conflicts:
	ocl.c

ocl.c

@@ -645,12 +645,8 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
 		clState->wsize = cgpu->work_size;
 	else if (strstr(name, "Tahiti"))
 		clState->wsize = 64;
-	else {
-		if (strstr(name, "Not Really Cypress - but maybe if sanitized :)"))
-			clState->wsize = 256;
-		else
-			clState->wsize = (clState->max_work_size <= 256 ? clState->max_work_size : 256) / clState->vwidth;
-	}
+	else
+		clState->wsize = (clState->max_work_size <= 256 ? clState->max_work_size : 256) / clState->vwidth;
 	cgpu->work_size = clState->wsize;
 
 #ifdef USE_SCRYPT