tree dbaaee49ccfe4414a35f674eff93b20e07d9aab5
parent 00c611def8748a0a1cf1d31842e49b42dfdb3de1
parent fa5b4a509d7bbba5d45c8ea177bddfd0b618876a
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1468353794 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1468353794 +0200

Merge branches 'acpica-fixes' and 'acpi-ec-fixes'

* acpica-fixes:
  Revert "ACPI 2.0 / AML: Improve module level execution by moving the If/Else/While execution to per-table basis"
  Revert "ACPICA: Namespace: Fix deadlock triggered by MLC support in dynamic table loading"
  Revert "ACPICA: Namespace: Fix namespace/interpreter lock ordering"

* acpi-ec-fixes:
  ACPI / EC: Fix code ordering issue in ec_remove_handlers()