Merge branch 'acpi-general'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Dec 2012 22:14:35 +0000 (23:14 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 7 Dec 2012 22:14:35 +0000 (23:14 +0100)
commit1a14f30b36e5d20a2a1be24888c2158541d97bab
tree790531441ea86f7873d3d2874f33eeb5c1f2e938
parent583bdc59820692eead7868e816d08bee4c55c1c6
parentcdc87c5a30f407ed1ce43d8a22261116873d5ef1
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
drivers/acpi/scan.c
drivers/pnp/pnpacpi/core.c