From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 20 Jan 2016 23:41:59 +0000 (+0100)
Subject: Merge branches 'acpica', 'acpi-video' and 'acpi-fan'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a72aea722f1b43442c9e219de824d5975dcdaa61;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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
---

a72aea722f1b43442c9e219de824d5975dcdaa61