From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 21 Oct 2016 20:24:23 +0000 (+0200)
Subject: Merge branches 'acpi-wdat' and 'acpi-cppc'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=956c8974da654016ec26e66322b5b221108468bf;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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()
---

956c8974da654016ec26e66322b5b221108468bf