# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1225986400 0
# Node ID bd4631c70392efea31f8b46d35b29f2dc9888810
# Parent  d9f775cbbc1e966a01bde053e1c9dd1c9b4a9210
merge -c1582 branches/stable-1.4: Typo.

diff -r d9f775cbbc1e -r bd4631c70392 NEWS
--- a/NEWS	Wed Nov 05 15:40:15 2008 +0000
+++ b/NEWS	Thu Nov 06 15:46:40 2008 +0000
@@ -22,6 +22,7 @@
 * Fixed race condition concerning the ec_slave_config_state->operational flag.
 * Fixed wrong calculation of the expected working counter if the process data
   of a domain span several datagrams.
+* Fixed typo in logging output.
 
 Changes in 1.4.0-rc3:
 
diff -r d9f775cbbc1e -r bd4631c70392 master/fsm_coe.c
--- a/master/fsm_coe.c	Wed Nov 05 15:40:15 2008 +0000
+++ b/master/fsm_coe.c	Thu Nov 06 15:46:40 2008 +0000
@@ -1404,7 +1404,7 @@
                 (jiffies - fsm->request->jiffies_sent) * 1000 / HZ;
             if (diff_ms < fsm->request->response_timeout) {
                 if (fsm->slave->master->debug_level) {
-                    EC_DBG("Slave %u did no respond to Sdo upload request. "
+                    EC_DBG("Slave %u did not respond to Sdo upload request. "
                             "Retrying after %u ms...\n",
                             slave->ring_position, (u32) diff_ms);
                 }