diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-13 06:37:03 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-13 06:37:03 +0900 |
| commit | f1b5e4fac164ff43b189d996e4f05f95cc57b984 (patch) | |
| tree | f78839a7aae68abb93a6aa0fd16b5875798d302a /drivers/media | |
| parent | Merge tag 'qcom-smd-list-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator (diff) | |
| parent | Merge branches 'acpica-fixes' and 'acpi-ec-fixes' (diff) | |
| download | linux-dev-f1b5e4fac164ff43b189d996e4f05f95cc57b984.tar.xz linux-dev-f1b5e4fac164ff43b189d996e4f05f95cc57b984.zip | |
Merge tag 'acpi-urgent-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"One ACPI EC driver regression fix (code ordering) and three reverts of
ACPICA commits, one that introduced a problem and two unsuccessful
attempted fixes on top of it.
Specifics:
- Fix a recent regression in the ACPI EC driver introduced by a fix
of another problem that uncovered a latent code ordering issue in
the driver (Lv Zheng).
- Revert a recent ACPICA commit that attempted to address a lock
ordering issue introduced by a previous fix, but caused Dell
Precision 5510 to fail to boot, revert that previous fix too and
finally revert the commit that caused the original problem (a
deadlock in the ACPICA code) to happen (Rafael Wysocki)"
* tag 'acpi-urgent-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
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: Fix code ordering issue in ec_remove_handlers()
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions