From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 14 Oct 2016 12:10:19 +0000 (+0200)
Subject: Merge branches 'acpi-fan', 'acpi-ec', 'acpi-drivers' and 'acpi-osl'
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~1350^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=522533f338f38e15106d5f58901f38fe7bd6a7d8;p=linux-4.9.git

Merge branches 'acpi-fan', 'acpi-ec', 'acpi-drivers' and 'acpi-osl'

* acpi-fan:
  ACPI / fan: Fix error reading cur_state

* acpi-ec:
  ACPI / EC: Fix unused function warning when CONFIG_PM_SLEEP=n

* acpi-drivers:
  ACPI / PAD: don't register acpi_pad driver if running as Xen dom0

* acpi-osl:
  acpi_os_vprintf: Use printk_get_level() to avoid unnecessary KERN_CONT
---

522533f338f38e15106d5f58901f38fe7bd6a7d8