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/osl.c | |
| parent | c730d30c313a24d9f8829cd2a4047c3eb8b89fec (diff) | |
| parent | 07070e12cf5cab46a783a4753f07bb99e557473b (diff) | |
| parent | a59ffb2062df3a5c346dbed931fa1e587fd0f0f3 (diff) | |
| parent | c1aaae673f68448253905bd9af6c6f9d31a7769a (diff) | |
| parent | e1c7481797542f4d2039d5a458ef80603298ad78 (diff) | |
| parent | 0bf6368ee8f25826d0645c0f7a4f17c8845356a4 (diff) | |
| download | linux-e25c5abf4125526d62417f8b5a314e743eefe900.tar.bz2 | |
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