Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-video' and 'acpi-dock'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 8 Apr 2014 11:29:15 +0000 (13:29 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 8 Apr 2014 11:29:15 +0000 (13:29 +0200)
commit0f9481ac2103861d3ca27f0e44a9335d9eb45f1e
tree045f7a4118f64e0d3a474ba801d1d33518fb6392
parentfe10739284bae68b57d3dbcad81f34772cfd2716
parent2d0acb4af981e20eb626c6ea1925e95056220b2a
parentee17fdf24bf815650c87b3bb35fbab42681523a8
parent997dd7fe546b33a4f86adc635c5ffc0e79966cf2
parent4e24ea2a2c942591ad3e843ec0efaca08f3cfa04
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