summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-04 14:01:17 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-04 14:01:17 +0100
commit3e5050e60e3b51e32940926ccb4aa5965f618306 (patch)
tree4c112357b97127fd9607e66c3d79d637e23f08bf /drivers
parentc09c9dd2e9c732658c744a802101d5c34fedde22 (diff)
parent1170419496ae333fff1c2e8ca7dccf9a412e97c1 (diff)
parent86f98a3abb237d95fddf2ec857df5a3ac6d71752 (diff)
parent64031e3e8a5c042840c5123af695eec89f9e6a24 (diff)
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