diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-17 09:44:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-17 09:44:57 +0100 |
| commit | 00f526850151e91fdad0896a1436341687ad2582 (patch) | |
| tree | 67c28260020440ade83d6f4aa003ae4f0c683e67 /arch/x86/kernel/tsc.c | |
| parent | cbf8b5a2b649a501758291cb4d4ba1e5711771ba (diff) | |
| parent | d89abe2a1f0c92499eedc815e4a9b2881f4959a5 (diff) | |
| download | blackbird-op-linux-00f526850151e91fdad0896a1436341687ad2582.tar.gz blackbird-op-linux-00f526850151e91fdad0896a1436341687ad2582.zip | |
Merge branch 'x86/cleanups' into x86/urgent
Pull in some merge window leftovers.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 56380440d862..5e19d2587cc5 100644 --- 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. */ |
