Merge branches 'acpi-processor', 'acpi-hotplug' and 'acpi-battery'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 10 Aug 2014 14:23:33 +0000 (16:23 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 10 Aug 2014 14:23:33 +0000 (16:23 +0200)
commit21c806d9b189c2da652eb7fad96b662d3e2c82eb
tree57b83b50c9283eaaf6a5d6a1e87a00b82c92507d
parent7725131982477bffff8ffdea143434dcc69f5d90
parentea9c167d93e6e2f4697f5061756f26356793cd95
parentdee1592638ab7ea35a32179b73f9284dead49c03
parentd719870b41e00baf64d028c2668ae1fc3eb50e79
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()
drivers/acpi/scan.c