Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linus

This commit is contained in:
Russell King
2013-03-03 00:32:50 +00:00
239 changed files with 2072 additions and 1307 deletions

View File

@@ -686,6 +686,9 @@ static int cpufreq_callback(struct notifier_block *nb,
if (freq->flags & CPUFREQ_CONST_LOOPS)
return NOTIFY_OK;
if (arm_delay_ops.const_clock)
return NOTIFY_OK;
if (!per_cpu(l_p_j_ref, cpu)) {
per_cpu(l_p_j_ref, cpu) =
per_cpu(cpu_data, cpu).loops_per_jiffy;