Merge back sysfs-related ACPI material for v5.9.