]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit623052feb2f35a01a79f949f597ccda9db0199f0
tree045f7a4118f64e0d3a474ba801d1d33518fb6392
parent8958b134070db4fcf28250a2a1ac50197178cc43
parenteca709616ac36e854ee46bad1e7feff8b117a3c4
parent826d2626daec45cd205d98234a274fac73330857
parent0968df6e7c4c26df523060e8bcf4519a06dfee44
parentc94acb5e644cd2d352b092a4b1f130b1e2f7f71b
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