]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'acpi-fan', 'acpi-ec', 'acpi-drivers' and 'acpi-osl'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 14 Oct 2016 12:10:19 +0000 (14:10 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 14 Oct 2016 12:10:19 +0000 (14:10 +0200)
commit80a80e3c5afb17176d05b0b7fc2821559c1f3d04
treedabeac8f6da16ac119d0f6abfab36cf52d9ea7fd
parente8717136d74e55870fcf2dd9374aff18f0a7968b
parent62cce6734342d780ba567cefb2ac53dec1470a08
parentf2ab2f41534ce4ee88a82e79cce95bfdf30c59cd
parenta89470448ffddd95cc4166f91db5476679cbf930
parent86240df79d08806fa325668a3a3f0e05951b91ae
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