summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-10 16:23:33 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-08-10 16:23:33 +0200
commit21c806d9b189c2da652eb7fad96b662d3e2c82eb (patch)
tree57b83b50c9283eaaf6a5d6a1e87a00b82c92507d
parentMerge tag 'pm+acpi-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentACPI / processor: Make acpi_cpu_soft_notify() process CPU FROZEN events (diff)
parentACPI / hotplug: Check scan handlers in acpi_scan_hot_remove() (diff)
parentACPI / battery: Fix warning message in acpi_battery_get_state() (diff)
downloadlinux-21c806d9b189c2da652eb7fad96b662d3e2c82eb.tar.xz
linux-21c806d9b189c2da652eb7fad96b662d3e2c82eb.zip
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()