tree 790531441ea86f7873d3d2874f33eeb5c1f2e938
parent 583bdc59820692eead7868e816d08bee4c55c1c6
parent cdc87c5a30f407ed1ce43d8a22261116873d5ef1
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1354918475 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1354918475 +0100

Merge branch 'acpi-general'

* acpi-general:
  pnpacpi: fix incorrect TEST_ALPHA() test
  ACPI / video: ignore BIOS initial backlight value for HP Folio 13-2000
  ACPI : do not use Lid and Sleep button for S5 wakeup