]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ddd04d 9ae9dc1)
Merge branch 'pm-sleep' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 19 May 2014 21:08:43 +0000 (23:08 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 19 May 2014 21:08:43 +0000 (23:08 +0200)
* pm-sleep:
  ACPI / PM: Avoid resuming devices in ACPI PM domain during system suspend
  PM / sleep: Update device PM documentation to cover direct_complete
  PM / sleep: Mechanism to avoid resuming runtime-suspended devices unnecessarily
  PM / hibernate: Fix memory corruption in resumedelay_setup()

1  2 
Documentation/power/runtime_pm.txt patch | diff1 | diff2 | blob | history
drivers/acpi/scan.c patch | diff1 | diff2 | blob | history

diff --cc Documentation/power/runtime_pm.txt
Simple merge
diff --cc drivers/acpi/scan.c
Simple merge
Linux kernel for KaRo TX COM modules