]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a50aecd 01c6a6a)
Merge branch 'acpi-sleep-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 31 Jul 2013 22:42:24 +0000 (00:42 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 31 Jul 2013 22:42:24 +0000 (00:42 +0200)
* 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

1  2 
drivers/acpi/osl.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/osl.c
Simple merge
Linux kernel for KaRo TX COM modules