Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[pandora-kernel.git] / arch / arm / mach-davinci / cpufreq.c

diff --git a/arch/arm/mach-davinci/cpufreq.c b/arch/arm/mach-davinci/cpufreq.c
index 4a68c2b..0a95be1 100644 (file)
--- a/arch/arm/mach-davinci/cpufreq.c
+++ b/arch/arm/mach-davinci/cpufreq.c
@@ -167,7 +167,7 @@ static int davinci_cpu_init(struct cpufreq_policy *policy)
        /*
         * Time measurement across the target() function yields ~1500-1800us
         * time taken with no drivers on notification list.
-        * Setting the latency to 2000 us to accomodate addition of drivers
+        * Setting the latency to 2000 us to accommodate addition of drivers
         * to pre/post change notification list.
         */
        policy->cpuinfo.transition_latency = 2000 * 1000;