Merge branches 'acpi-scan' and 'acpi-prm' * acpi-scan: ACPI: scan: Remove unneeded header linux/nls.h * acpi-prm: ACPI: PRM: Find PRMT table before parsing it