Merge branch 'acpica-cherry-pick' into release