Merge commit '7d544d9' into bfgminer

Conflicts:
	cgminer.c

miner.c

@@ -7041,7 +7041,12 @@ static void *watchdog_thread(void __maybe_unused *userdata)
 
 		for (i = 0; i < total_devices; ++i) {
 			struct cgpu_info *cgpu = devices[i];
-			struct thr_info *thr = cgpu->thr[0];
+			struct thr_info *thr;
+			for (int thrid = 0; thrid < cgpu->threads; ++thrid) {
+				thr = cgpu->thr[thrid];
+				if (!thr->q->frozen)
+					break;
+			}
 			enum dev_enable *denable;
 			char dev_str[8];
 			int gpu;