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)
* 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()

1  2  3  4 
drivers/acpi/scan.c

Simple merge