Merge branch 'acpi-modparam' into release