Merge remote-tracking branch 'bfg-pull/369/head' into bfgminer

Conflicts:
	miner.h
	scrypt.c

driver-ztex.c

@@ -374,7 +374,7 @@ static bool ztex_prepare(struct thr_info *thr)
 		thr->cgpu->deven = DEV_DISABLED;
 		return true;
 	}
-	ztex->dclk.freqM = ztex->dclk.freqMaxM+1;;
+	ztex->dclk.freqM = ztex->dclk.freqMaxM+1;
 	//ztex_updateFreq(thr);
 	libztex_setFreq(ztex, ztex->dclk.freqMDefault, cgpu->proc_repr);
 	ztex_releaseFpga(ztex);

ocl.c

@@ -325,7 +325,7 @@ int clDevicesNum(void) {
 	}
 
 	if (opt_platform_id < 0)
-		opt_platform_id = mdplatform;;
+		opt_platform_id = mdplatform;
 	if (mdmesa && opt_g_threads == -1)
 		opt_g_threads = 1;
 

util.h

@@ -253,7 +253,7 @@ void bytes_extend_buf(bytes_t * const b, const size_t newsz)
 static inline
 void bytes_resize(bytes_t * const b, const size_t newsz)
 {
-	bytes_extend_buf(b, newsz);;
+	bytes_extend_buf(b, newsz);
 	b->sz = newsz;
 }