Merge back earlier ACPICA-related changes for 5.10.