Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into devel...

[karo-tx-linux.git] / kernel / debug / debug_core.c

diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
index cefd4a11f6d9e27b2ae146ef0be6bf940bf41587..bad6786dee88844d61dae27f83d82dbf1c40840f 100644 (file)
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -538,7 +538,7 @@ return_normal:
 
        /*
         * For single stepping, try to only enter on the processor
-        * that was single stepping.  To gaurd against a deadlock, the
+        * that was single stepping.  To guard against a deadlock, the
         * kernel will only try for the value of sstep_tries before
         * giving up and continuing on.
         */