Merge branch 'thinkpad-acpi' into release