diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-03-26 16:55:56 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-03-26 16:55:56 +0100 |
| commit | e1db18b59729e24f001459b98955019344d5b12b (patch) | |
| tree | c38791e9bd4c35b08bab36b8d1d0fa9f9f5a2ee7 | |
| parent | 25928deeb1e4e2cdae1dccff349320c6841eb5f8 (diff) | |
| parent | c1d1e25a8c542816ae8dee41b81a18d30c7519a0 (diff) | |
| parent | eb50aaf960e3bedfef79063411ffd670da94b84b (diff) | |
Merge branches 'acpi-video' and 'acpi-scan'acpi-5.12-rc5
* acpi-video:
ACPI: video: Add missing callback back for Sony VPCEH3U1E
* acpi-scan:
ACPI: scan: Use unique number for instance_no