diff options
| author | Rafael J. Wysocki | 2016-10-21 22:24:23 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2016-10-21 22:24:23 +0200 |
| commit | 956c8974da654016ec26e66322b5b221108468bf (patch) | |
| tree | 8c85b4d459607ab1f2912e947603e0b9c092cd08 /drivers/net | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
| parent | 28e3d7002ba9f773662b2cf75d28cadfa29dc442 (diff) | |
| parent | d0679cfaf54c9e42e3ba4f8d5e67969932040d16 (diff) | |
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()