diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-04 14:01:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-04 14:01:17 +0100 |
| commit | 3e5050e60e3b51e32940926ccb4aa5965f618306 (patch) | |
| tree | 4c112357b97127fd9607e66c3d79d637e23f08bf /drivers/acpi/Kconfig | |
| parent | Merge branches 'acpi-pci' and 'pm-pci' (diff) | |
| parent | ACPI: Better describe ACPI_DEBUGGER (diff) | |
| parent | MAINTAINERS: ACPI / video: update a file name in drivers/acpi/ (diff) | |
| parent | ACPI / property: fix compile error for acpi_node_get_property_reference() whe... (diff) | |
| download | linux-3e5050e60e3b51e32940926ccb4aa5965f618306.tar.xz linux-3e5050e60e3b51e32940926ccb4aa5965f618306.zip | |
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