summaryrefslogtreecommitdiff
path: root/drivers/zorro
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-12 23:03:14 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-12 23:03:14 +0300
commitd0420d20bacd1eef9f75a769ad48befd383ad190 (patch)
treedbaaee49ccfe4414a35f674eff93b20e07d9aab5 /drivers/zorro
parent00c611def8748a0a1cf1d31842e49b42dfdb3de1 (diff)
parentfa5b4a509d7bbba5d45c8ea177bddfd0b618876a (diff)
downloadlinux-d0420d20bacd1eef9f75a769ad48befd383ad190.tar.xz
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()
Diffstat (limited to 'drivers/zorro')
0 files changed, 0 insertions, 0 deletions