git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d18aec 9801284 3afcb96)
Merge branches 'acpi-ac' and 'acpi-proc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 15 May 2014 12:09:23 +0000 (14:09 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 15 May 2014 12:09:23 +0000 (14:09 +0200)
* 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"


Trivial merge
Pandora Kernel Repository