aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-08 01:07:06 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-08 01:07:06 +0100
commitbeb0082efdb9ed54c3a3ca45a778224d59976cc5 (patch)
tree2f96a64dada9820f5b319d11d461869e96cca238
parent0414855fdc4a40da05221fc6062cccbc0c30f169 (diff)
parentb355cee88e3b1a193f0e9a81db810f6f83ad728b (diff)
parentad332c8a45330d170bb38b95209de449b31cd1b4 (diff)
parent3130497f5babd42b24a7febda46b46116e0adc83 (diff)
downloadlinux-beb0082efdb9ed54c3a3ca45a778224d59976cc5.tar.gz
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