From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 12 Jul 2016 20:03:14 +0000 (+0200)
Subject: Merge branches 'acpica-fixes' and 'acpi-ec-fixes'
X-Git-Tag: v4.7~35^2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=d0420d20bacd1eef9f75a769ad48befd383ad190

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()
---

d0420d20bacd1eef9f75a769ad48befd383ad190