]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'acpi-wdat' and 'acpi-cppc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Oct 2016 20:24:23 +0000 (22:24 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Oct 2016 20:24:23 +0000 (22:24 +0200)
commitf140a09aae73338d9a259e96602c9d4354823733
tree8c85b4d459607ab1f2912e947603e0b9c092cd08
parent1df7eb1ca477b826c461b694d57789b4da41844a
parentc8dc41c6c4a3b9bea843178421adcc118a80d2ee
parentc8b89a8b1082e8a7d08fca08f1cac6fe402ab463
Merge branches 'acpi-wdat' and 'acpi-cppc'

* acpi-wdat:
  watchdog: wdat_wdt: Ping the watchdog on resume

* acpi-cppc:
  mailbox: PCC: Fix return value of pcc_mbox_request_channel()