]> 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)
commit8b4b29196e14f138c562e8719f33a7525cfc9ea2
tree4c112357b97127fd9607e66c3d79d637e23f08bf
parent6051e190196f3e5cde3f757f252ebfeddad548f6
parent1a2986801fd269f1b5d99d4c2765e4123715a110
parent6209619236340322fbf2bec3b6440811183df501
parent3db8f5642b8473c98d68fa8eee07b7952ec2f39f
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