diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-21 02:41:59 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-21 02:41:59 +0300 |
| commit | a72aea722f1b43442c9e219de824d5975dcdaa61 (patch) | |
| tree | 299a906922d98152c575b8d137da83f17ac71cc8 /tools/power | |
| parent | 67990608c8b95d2b8ccc29932376ae73d5818727 (diff) | |
| parent | 770188f79e91771b95bd9b015fbbff19873bbea6 (diff) | |
| parent | b21f2e81bd3fd8ed260590e72901254bca2193cd (diff) | |
| parent | f9727999694f76d329738614f2fd61d800509319 (diff) | |
| download | linux-a72aea722f1b43442c9e219de824d5975dcdaa61.tar.xz | |
Merge branches 'acpica', 'acpi-video' and 'acpi-fan'
* acpica:
ACPICA: Update version to 20160108
ACPICA: Silence a -Wbad-function-cast warning when acpi_uintptr_t is 'uintptr_t'
ACPICA: Additional 2016 copyright changes
ACPICA: Reduce regression fix divergence from upstream ACPICA
* acpi-video:
ACPI / video: Add disable_backlight_sysfs_if quirk for the Toshiba Satellite R830
ACPI / video: Revert "thinkpad_acpi: Use acpi_video_handles_brightness_key_presses()"
ACPI / video: Document acpi_video_handles_brightness_key_presses() a bit
ACPI / video: Fix using an uninitialized mutex / list_head in acpi_video_handles_brightness_key_presses()
ACPI / video: Revert "ACPI / video: driver must be registered before checking for keypresses"
ACPI / video: Add disable_backlight_sysfs_if quirk for the Toshiba Portege R700
* acpi-fan:
ACPI / fan: Improve acpi_device_update_power error message