Merge tag 'fixes' into 'for-next'

Allows uniwill-laptop feature work that depends on changes in the fixes
branch proceed.

diff --cc drivers/platform/x86/lenovo/thinkpad_acpi.c
Simple merge