]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6d211d d48dc06 9801284 3a670cc 0b9d46d)
Merge branches 'acpica', 'acpi-ac', 'acpi-proc' and 'acpi-processor'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 9 May 2014 21:21:26 +0000 (23:21 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 9 May 2014 21:21:26 +0000 (23:21 +0200)
* 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


Trivial merge
Linux kernel for KaRo TX COM modules