diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-08 04:07:06 +0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-08 04:07:06 +0400 |
commit | beb0082efdb9ed54c3a3ca45a778224d59976cc5 (patch) | |
tree | 2f96a64dada9820f5b319d11d461869e96cca238 /drivers | |
parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
parent | b355cee88e3b1a193f0e9a81db810f6f83ad728b (diff) | |
parent | ad332c8a45330d170bb38b95209de449b31cd1b4 (diff) | |
parent | 3130497f5babd42b24a7febda46b46116e0adc83 (diff) | |
download | linux-beb0082efdb9ed54c3a3ca45a778224d59976cc5.tar.xz |
Merge branches 'acpi-resources', 'acpi-ec' and 'acpi-sleep'
* acpi-resources:
ACPI / resources: ignore invalid ACPI device resources
* acpi-ec:
ACPI / EC: Clear stale EC events on Samsung systems
* acpi-sleep:
ACPI / sleep: pm_power_off needs more sanity checks to be installed