]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'acpica', 'acpi-video' and 'device-properties'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Dec 2015 13:01:17 +0000 (14:01 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Dec 2015 13:01:17 +0000 (14:01 +0100)
commitbce04344c5cba75f79b325e0027254c553930be6
tree4c112357b97127fd9607e66c3d79d637e23f08bf
parent8c15ae570490821da4eb11f50ef76bc9ac00aafe
parent8d914cf2ddc1c58efae064668bf9c103efdd6fbf
parentd33d5dbe7eb91a1daebbfd6c921a7188f84aa575
parentb37fd1c66513a56763df2413aa5b677286721342
Merge branches 'acpica', 'acpi-video' and 'device-properties'

* acpica:
  ACPI: Better describe ACPI_DEBUGGER

* acpi-video:
  MAINTAINERS: ACPI / video: update a file name in drivers/acpi/

* device-properties:
  ACPI / property: fix compile error for acpi_node_get_property_reference() when CONFIG_ACPI=n
drivers/acpi/Kconfig
include/linux/acpi.h