]> 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: 2b06c9d 40bf66e)
Merge branch 'pm-acpi-next' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 13 Sep 2012 22:30:12 +0000 (00:30 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 13 Sep 2012 22:30:12 +0000 (00:30 +0200)
* pm-acpi-next:
  ACPI / PM: Fix resource_lock dead lock in acpi_power_on_device
  ACPI / PM: Infer parent power state from child if unknown, v2


Trivial merge
Linux kernel for KaRo TX COM modules