Merge branch 'acpi-fixes'

Browse source

* acpi-fixes:
  ACPI / video: Add "Asus UL30A" to ACPI video detect blacklist
  ACPI / PM: Allow device power states to be used for CONFIG_PM unset

...

This commit is contained in:

Rafael J. Wysocki 2013-05-23 10:33:44 +02:00

parent c7788792a5 c8f6d8351b

commit f1a0b8310c

4 changed files with 78 additions and 98 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/acpi/Makefile

View file

126

drivers/acpi/device_pm.c

View file

8

drivers/acpi/video_detect.c

View file

40

include/acpi/acpi_bus.h

View file