From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 10 Aug 2014 14:23:33 +0000 (+0200)
Subject: Merge branches 'acpi-processor', 'acpi-hotplug' and 'acpi-battery'
X-Git-Tag: firefly_0821_release~176^2~3381^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=21c806d9b189c2da652eb7fad96b662d3e2c82eb;p=firefly-linux-kernel-4.4.55.git

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

21c806d9b189c2da652eb7fad96b662d3e2c82eb