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

Browse source

* pm-cpufreq:
  cpufreq: update 'cpufreq_suspended' after stopping governors
  cpufreq: integrator: fix integrator_cpufreq_remove return type
  cpufreq: pcc-cpufreq: Fix wait_event() under spinlock

* acpi-video:
  ACPI / i915: Update the condition to ignore firmware backlight change request

...

This commit is contained in:

Rafael J. Wysocki 2014-10-03 03:10:07 +02:00

parent fe82dcec64 b1b12babe3 77076c7aac

commit abcadddc85

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

drivers/cpufreq/cpufreq.c

View file

4

drivers/cpufreq/integrator-cpufreq.c

View file

2

drivers/cpufreq/pcc-cpufreq.c

View file

16

drivers/gpu/drm/i915/intel_opregion.c

View file