Merge remote-tracking branch 'pdx86/fixes' into pdx86/for-next

Merge pdx86/fixes into pdx86/for-next because there are some
pdx86 patches pending for the next release which build on top
of some of the fixes.

diff --cc drivers/platform/x86/asus-wmi.c
Simple merge

diff --cc drivers/platform/x86/intel/tpmi.c
Simple merge

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