Merge branches 'acpi-pm' and 'pm-cpufreq'

Browse source

* acpi-pm:
  ACPI / PM: Blacklist Low Power S0 Idle _DSM for ThinkPad X1 Tablet(2016)

* pm-cpufreq:
  cpufreq: brcmstb-avs-cpufreq: remove development debug support

...

This commit is contained in:

Rafael J. Wysocki 2018-04-26 15:10:25 +02:00

parent ae860a19f3 855c1c2fce ee53a65dc7

commit e140c4af1b

3 changed files with 14 additions and 332 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

13

drivers/acpi/sleep.c

View file

10

drivers/cpufreq/Kconfig.arm

View file

323

drivers/cpufreq/brcmstb-avs-cpufreq.c

View file