aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-21 22:24:23 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-10-21 22:24:23 +0200
commit956c8974da654016ec26e66322b5b221108468bf (patch)
tree8c85b4d459607ab1f2912e947603e0b9c092cd08
parent1001354ca34179f3db924eb66672442a173147dc (diff)
parent28e3d7002ba9f773662b2cf75d28cadfa29dc442 (diff)
parentd0679cfaf54c9e42e3ba4f8d5e67969932040d16 (diff)
downloadlinux-stericsson-956c8974da654016ec26e66322b5b221108468bf.tar.gz
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()