Merge remote-tracking branch 'origin/unstable' into unstable

diff --git a/src/debug.c b/src/debug.c
index be3db882bbd8a863b5e3be6fc0032a9401616e6e..2725aae6ca3f8b9d2d26abd357bcd37df0ec84bf 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -834,7 +834,7 @@ void watchdogScheduleSignal(int period) {
     setitimer(ITIMER_REAL, &it, NULL);
 }
 
-/* Enable the software watchdong with the specified period in milliseconds. */
+/* Enable the software watchdog with the specified period in milliseconds. */
 void enableWatchdog(int period) {
     int min_period;