summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-10 18:23:33 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-10 18:23:33 +0400
commit21c806d9b189c2da652eb7fad96b662d3e2c82eb (patch)
tree57b83b50c9283eaaf6a5d6a1e87a00b82c92507d /drivers/acpi
parent7725131982477bffff8ffdea143434dcc69f5d90 (diff)
parentea9c167d93e6e2f4697f5061756f26356793cd95 (diff)
parentdee1592638ab7ea35a32179b73f9284dead49c03 (diff)
parentd719870b41e00baf64d028c2668ae1fc3eb50e79 (diff)
downloadlinux-21c806d9b189c2da652eb7fad96b662d3e2c82eb.tar.xz
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()