| commit | 3011ef60d8406ad549f99cf40b2bbd6df095ce73 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Thu May 15 14:09:23 2014 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Thu May 15 14:09:23 2014 +0200 |
| tree | 0ff9f5291dd1ff463d184e6dd10105683d2f50df | |
| parent | 7d18aecd39180ac803e837ee0508a3bc12b168f3 [diff] | |
| parent | 98012849e0cbf980326f8e34d571f4474866a88e [diff] | |
| parent | 3afcb96fee9ba33ce838f2ceaa248358cffe2f56 [diff] |
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"