Merge branch 'next' of git://github.com/kernelslacker/cpufreq