diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 13:29:15 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 13:29:15 +0200 |
| commit | 0f9481ac2103861d3ca27f0e44a9335d9eb45f1e (patch) | |
| tree | 045f7a4118f64e0d3a474ba801d1d33518fb6392 /drivers/net/wireless/iwlwifi/mvm/constants.h | |
| parent | fe10739284bae68b57d3dbcad81f34772cfd2716 (diff) | |
| parent | 2d0acb4af981e20eb626c6ea1925e95056220b2a (diff) | |
| parent | ee17fdf24bf815650c87b3bb35fbab42681523a8 (diff) | |
| parent | 997dd7fe546b33a4f86adc635c5ffc0e79966cf2 (diff) | |
| parent | 4e24ea2a2c942591ad3e843ec0efaca08f3cfa04 (diff) | |
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