
This is a step along the way for the 5.7-rc1 merge, and resolves a bunch of the DRM-specific merge conflicts in one point. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I056c4edc603fdd3c24588c8a9305cfa67111eb5b
20 KiB
20 KiB