diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 13:20:47 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 13:20:47 +0100 |
| commit | e25c5abf4125526d62417f8b5a314e743eefe900 (patch) | |
| tree | 22ddee10e98f0e53b12e7ef641dfd4aa16d4e104 /drivers/acpi/dock.c | |
| parent | Merge branch 'acpi-fan' (diff) | |
| parent | ACPI: Remove duplicate definitions of PREFIX (diff) | |
| parent | ACPI / thermal: make acpi_thermal_check asynchronous on resume (diff) | |
| parent | ACPI / PCI: Do not call ISA-specific code if ISA is not supported (diff) | |
| parent | ACPI / LPSS: Add Intel BayTrail ACPI mode PWM (diff) | |
| parent | ACPI / button: Add ACPI Button event via netlink routine (diff) | |
| download | linux-e25c5abf4125526d62417f8b5a314e743eefe900.tar.xz linux-e25c5abf4125526d62417f8b5a314e743eefe900.zip | |
Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-pci', 'acpi-lpss' and 'acpi-button'
* acpi-cleanup:
ACPI: Remove duplicate definitions of PREFIX
ACPI / tables: Replace printk with pr_*
* acpi-thermal:
ACPI / thermal: make acpi_thermal_check asynchronous on resume
* acpi-pci:
ACPI / PCI: Do not call ISA-specific code if ISA is not supported
* acpi-lpss:
ACPI / LPSS: Add Intel BayTrail ACPI mode PWM
* acpi-button:
ACPI / button: Add ACPI Button event via netlink routine