Merge branches 'acpi-tables' and 'acpi-docs' into linux-next

* acpi-tables:
  ACPI: tables: FPDT: Don't call acpi_os_map_memory() on invalid phys address

* acpi-docs:
  ACPI: docs: enumeration: Fix a few typos and wording mistakes