OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
00c611d
fa5b4a5
)
Merge branches 'acpica-fixes' and 'acpi-ec-fixes'
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Tue, 12 Jul 2016 20:03:14 +0000
(22:03 +0200)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Tue, 12 Jul 2016 20:03:14 +0000
(22:03 +0200)
* 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()
Trivial merge