Merge branch 'acpi-scan'

* acpi-scan:
  ACPI / scan: Fix NULL pointer dereference in acpi_companion_match()