From d52db7ffba29408a4a72392ee6a960577cbc22a3 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Tue, 26 May 2009 14:58:39 -0700
Subject: [PATCH] --- yaml --- r: 145423 b: refs/heads/master c:
 61c8c67e3ad67ea1d1360f2e88688bd942834756 h: refs/heads/master i:   145421:
 65397d621ccc537ebf0bc19f05ef513bd62f0480   145419:
 5131e65d148400ac4a2795e9adbe5e746f0eefc7   145415:
 f3454cc40a6310d1f03cdc29689b570852e8ab38   145407:
 166de486808a60d90701b0818a1c9c31faaad02b v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 257ba27155b1..e48e03c7b882 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21671b88be331fb9c95891d5ee7d2e940e6b024c
+refs/heads/master: 61c8c67e3ad67ea1d1360f2e88688bd942834756
diff --git a/trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index 208ecf6643df..54b6de2cd947 100644
--- a/trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/trunk/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -693,8 +693,8 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
 	if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE &&
 	    policy->cpuinfo.transition_latency > 20 * 1000) {
 		policy->cpuinfo.transition_latency = 20 * 1000;
-			printk_once(KERN_INFO "Capping off P-state tranision"
-				    " latency at 20 uS\n");
+		printk_once(KERN_INFO
+			    "P-state transition latency capped at 20 uS\n");
 	}
 
 	/* table init */