tree 2cda8d4ac3d1f2d9732a2b16feb15b14f91c83f7
parent 0ad4c9a9848fdd46dc422160efd947489a98bbc1
parent 01c6a6afd50f07dfd66b2891fd194c4b789fca48
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1377559718 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1377559718 +0200

Merge branch 'acpi-sleep'

* acpi-sleep:
  x86 / tboot / ACPI: Fail extended mode reduced hardware sleep
  xen / ACPI: notify xen when reduced hardware sleep is available
  ACPI / sleep: Introduce acpi_os_prepare_extended_sleep() for extended sleep path