diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-26 17:27:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-26 17:27:00 -0800 |
| commit | 2287a240a6b1c39fd06f94e57b8c0189c497efe5 (patch) | |
| tree | c7bddc9413af2d8a2a877ecd00e05af10c5375d1 /include/crypto/padlock.h | |
| parent | 7d3a0fa52e4d9fa2cfe04a5f6e21d1d78169edb5 (diff) | |
| parent | 0389227dde3abae442521948caf5c173e696cdca (diff) | |
Merge tag 'acpi-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These fix two regressions introduced recently, one by reverting the
problematic commit and one by fixing up locking in the ACPICA core.
Specifics:
- Revert a recent change that added an ACPI video blacklist entry for
HP Pavilion dv6 as it turned to introduce backlight handling
regressions on some systems (Hans de Goede).
- Fix locking in the ACPICA core to avoid deadlocks related to table
loading that were exposed by a recent change in that area (Lv
Zheng)"
* tag 'acpi-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "ACPI / video: Add force_native quirk for HP Pavilion dv6"
ACPICA: Tables: Fix hidden logic related to acpi_tb_install_standard_table()
Diffstat (limited to 'include/crypto/padlock.h')
0 files changed, 0 insertions, 0 deletions