]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'acpi-sleep-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 4 Aug 2013 21:51:40 +0000 (23:51 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 4 Aug 2013 21:51:40 +0000 (23:51 +0200)
commitc268333225287f1dda404ec963bf17ab798818db
treea9e67f679eb7317a0c7d53eb1ed9929a8248beb2
parentc5465dce780ec7266303f16d9e93fe1400938571
parent01c6a6afd50f07dfd66b2891fd194c4b789fca48
Merge branch 'acpi-sleep-next' into linux-next

* acpi-sleep-next:
  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
drivers/acpi/osl.c