diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:43:03 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:43:03 +0200 |
| commit | 54d0b14ad7cc4ff3c710f092a93638f359c1b14b (patch) | |
| tree | 563e67a8ef03451adf542d0273be62bf754d2a0b /arch/ia64 | |
| parent | 273b5a4836966eb192af9d01d0cdef2e30585864 (diff) | |
| parent | c11dd70fd7f50fca7dc05520ec8075f12d93cb63 (diff) | |
| parent | c49b43ce03944bb7cfb75f8a4f8f6ba799fa517e (diff) | |
| parent | a3bcf2d45d6a9c7950f58ec7dad20f22d422abd2 (diff) | |
| download | linux-54d0b14ad7cc4ff3c710f092a93638f359c1b14b.tar.gz linux-54d0b14ad7cc4ff3c710f092a93638f359c1b14b.tar.bz2 linux-54d0b14ad7cc4ff3c710f092a93638f359c1b14b.zip | |
Merge branches 'acpi-drivers', 'acpi-misc' and 'acpi-tools'
* acpi-drivers:
ACPI / DPTF: move int340x_thermal.c to the DPTF folder
ACPI / DPTF: Add DPTF power participant driver
* acpi-misc:
ACPI / lpat: make it explicitly non-modular
ACPI / dock: make dock explicitly non-modular
* acpi-tools:
tools/acpi: use CROSS_COMPILE to define prefix