From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 9 May 2014 21:21:26 +0000 (+0200)
Subject: Merge branches 'acpica', 'acpi-ac', 'acpi-proc' and 'acpi-processor'
X-Git-Tag: next-20140516~71^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=79692ed9c3b859450c515ed88020159973b2099f;p=karo-tx-linux.git

Merge branches 'acpica', 'acpi-ac', 'acpi-proc' and 'acpi-processor'

* acpica:
  ACPICA: Tables: Fix invalid pointer accesses in acpi_tb_parse_root_table().

* acpi-ac:
  ACPI: Revert "ACPI / AC: convert ACPI ac driver to platform bus"

* acpi-proc:
  ACPI: Revert "ACPI / Battery: Remove battery's proc directory"
  ACPI: Revert "ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c"

* acpi-processor:
  ACPI / processor: do not mark present at boot but not onlined CPU as onlined
---

79692ed9c3b859450c515ed88020159973b2099f