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)
commite1db18b59729e24f001459b98955019344d5b12b
treec38791e9bd4c35b08bab36b8d1d0fa9f9f5a2ee7
parent25928deeb1e4e2cdae1dccff349320c6841eb5f8
parentc1d1e25a8c542816ae8dee41b81a18d30c7519a0
parenteb50aaf960e3bedfef79063411ffd670da94b84b
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