commit | 21c806d9b189c2da652eb7fad96b662d3e2c82eb | [log] [tgz] |
---|---|---|
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Sun Aug 10 16:23:33 2014 +0200 |
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Sun Aug 10 16:23:33 2014 +0200 |
tree | 57b83b50c9283eaaf6a5d6a1e87a00b82c92507d | |
parent | 7725131982477bffff8ffdea143434dcc69f5d90 [diff] | |
parent | ea9c167d93e6e2f4697f5061756f26356793cd95 [diff] | |
parent | dee1592638ab7ea35a32179b73f9284dead49c03 [diff] | |
parent | d719870b41e00baf64d028c2668ae1fc3eb50e79 [diff] |
Merge branches 'acpi-processor', 'acpi-hotplug' and 'acpi-battery' * acpi-processor: ACPI / processor: Make acpi_cpu_soft_notify() process CPU FROZEN events * acpi-hotplug: ACPI / hotplug: Check scan handlers in acpi_scan_hot_remove() * acpi-battery: ACPI / battery: Fix warning message in acpi_battery_get_state()