Merge branch 'x86/cleanups' into x86/urgent

[linux-2.6-block.git] / arch / x86 / kernel / tsc.c

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 56380440d86229a41314487792decd6a04190fca..5e19d2587cc5ff3b699668202b7178eee5a19eb7 100644 (file)
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -881,7 +881,7 @@ void tsc_restore_sched_clock_state(void)
        local_irq_save(flags);
 
        /*
-        * We're comming out of suspend, there's no concurrency yet; don't
+        * We're coming out of suspend, there's no concurrency yet; don't
         * bother being nice about the RCU stuff, just write to both
         * data fields.
         */