From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 15 May 2014 12:09:23 +0000 (+0200)
Subject: Merge branches 'acpi-ac' and 'acpi-proc'
X-Git-Tag: v3.15-rc6~22^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3011ef60d8406ad549f99cf40b2bbd6df095ce73;p=linux-2.6-block.git

Merge branches 'acpi-ac' and 'acpi-proc'

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

* acpi-proc:
  ACPI / proc: Do not say when /proc interfaces will be deleted in Kconfig
  ACPI: Revert "ACPI / Battery: Remove battery's proc directory"
  ACPI: Revert "ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c"
---

3011ef60d8406ad549f99cf40b2bbd6df095ce73