diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-07 01:17:06 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-07 01:17:06 +0200 |
| commit | 1e765cd36bb8242a399f65501650bcfabc2229c9 (patch) | |
| tree | f19d826d24fed916e1ec031d8aa97a58dd767350 /kernel/power | |
| parent | dbcbe68bb76c4f8057160209859ecd7c75e86c30 (diff) | |
| parent | ef86c3f4bec932bee4ad05728f7306359ae2f87a (diff) | |
| parent | ffd8a731d9bfd186b8bb8b88f558de7e04ae06e6 (diff) | |
| parent | 5d30f7410220eb212614654677264f1ba04ae746 (diff) | |
| parent | 88989fd26a7475abdda222859c2bd76fce46976e (diff) | |
Merge branches 'acpi-processor', 'acpi-battery', 'acpi-utils' and 'acpi-fan'
* acpi-processor:
ACPI / processor: use container_of instead of casting first structure member
* acpi-battery:
ACPI / battery: Replace strnicmp with strncasecmp
* acpi-utils:
ACPI / utils: Update acpi_check_dsm() comments
* acpi-fan:
ACPI / fan: printk replacement