diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 01:17:18 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 01:17:18 +0200 |
| commit | 763d949581ed1d610c5e09081b36d9beea8e4abc (patch) | |
| tree | 283a128629dfa7065002c092302f12d220504ba3 | |
| parent | 0cddc580d4b508699761c67e9db7d21709dc2b06 (diff) | |
| parent | 048d16da75cc3ae1a75455c0e7b2bf107c4f0f84 (diff) | |
| parent | b03466883edb192b3e3877ea3f71036a3899ae51 (diff) | |
| download | linux-763d949581ed1d610c5e09081b36d9beea8e4abc.tar.gz | |
Merge branches 'acpi-battery' and 'acpi-processor'
* acpi-battery: ACPI / battery: mark DMI table as __initconst ACPI / battery: minor tweaks to acpi_battery_units() ACPI / battery: constify the offset tables ACPI / battery: ensure acpi_battery_init() has finish ACPI / battery: drop useless return statements ACPI / battery: abort initialization earlier if acpi_disabled * acpi-processor: ACPI / processor: constify DMI system id table ACPI / processor: Introduce invalid_phys_cpuid() ACPI / processor: return specific error instead of -1 ACPI / processor: remove phys_id in acpi_processor_get_info() ACPI / processor: remove cpu_index in acpi_processor_get_info() Xen / ACPI / processor: Remove unneeded NULL check Xen / ACPI / processor: use invalid_logical_cpuid() ACPI / processor: Introduce invalid_logical_cpuid()