Merge branches 'acpi-video' and 'acpi-scan'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Mar 2021 15:55:56 +0000 (16:55 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Mar 2021 15:55:56 +0000 (16:55 +0100)
* acpi-video:
  ACPI: video: Add missing callback back for Sony VPCEH3U1E

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


Trivial merge