Merge branch 'pm-opp'
[pandora-kernel.git] / include / linux / cpufreq.h
Simple merge