Merge branches 'pm-cpufreq-fixes' and 'pm-sleep-fixes'

Browse source

* pm-cpufreq-fixes:
  cpufreq: mediatek: allow building as a module
  cpufreq: qoriq: allow building as module with THERMAL=m

* pm-sleep-fixes:
  PM / sleep / x86: Fix crash on graph trace through x86 suspend

...

This commit is contained in:

Rafael J. Wysocki 2016-03-04 22:41:05 +01:00

parent fc77dbd34c 3c2002aec3 92f9e179a7

commit bfc6b97d52

4 changed files with 11 additions and 2 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

7

arch/x86/kernel/acpi/sleep.c

View file

1

drivers/cpufreq/Kconfig

View file

4

drivers/cpufreq/Kconfig.arm

View file

1

drivers/cpufreq/mt8173-cpufreq.c

View file