From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 26 Mar 2021 15:55:56 +0000 (+0100)
Subject: Merge branches 'acpi-video' and 'acpi-scan'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e1db18b59729e24f001459b98955019344d5b12b;p=linux.git

Merge branches 'acpi-video' and 'acpi-scan'

* acpi-video:
  ACPI: video: Add missing callback back for Sony VPCEH3U1E

* acpi-scan:
  ACPI: scan: Use unique number for instance_no
---

e1db18b59729e24f001459b98955019344d5b12b