Merge branches 'pm-cpufreq' and 'pm-cpuidle'

Browse source

* pm-cpufreq:
  cpufreq: unlock when failing cpufreq_update_policy()
  intel_pstate: Correct rounding in busy calculation
  cpufreq: cpufreq-cpu0: fix CPU_THERMAL dependency

* pm-cpuidle:
  cpuidle: mvebu: Fix the name of the states

...

This commit is contained in:

Rafael J. Wysocki 2014-06-19 14:41:22 +02:00

parent 639bb92a1f fefa8ff810 dc559aabe2

commit 2ba87ea132

4 changed files with 9 additions and 12 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/cpufreq/Kconfig

View file

10

drivers/cpufreq/cpufreq.c

View file

5

drivers/cpufreq/intel_pstate.c

View file

4

drivers/cpuidle/cpuidle-armada-370-xp.c

View file