Merge branches 'upstream-fixes' and 'magicmouse' into for-linus
[deliverable/linux.git] / drivers / cpufreq / e_powersaver.c
CommitLineData