From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 8 Apr 2014 11:29:15 +0000 (+0200)
Subject: Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-video' and 'acpi-dock'
X-Git-Tag: firefly_0821_release~176^2~4082^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0f9481ac2103861d3ca27f0e44a9335d9eb45f1e;p=firefly-linux-kernel-4.4.55.git

Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-video' and 'acpi-dock'

* acpi-cleanup:
  ACPI: Clean up memory allocations

* acpi-thermal:
  ACPI / thermal: Fix wrong variable usage in debug statement

* acpi-video:
  ACPI / video: Favor native backlight interface for ThinkPad Helix

* acpi-dock:
  ACPI / dock: Drop dock_device_ids[] table
---

0f9481ac2103861d3ca27f0e44a9335d9eb45f1e