Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / cpufreq / sc520_freq.c