Commit 48ef1614 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge faa39218 ("Merge tag 'drm-next-2020-06-02' of...

Merge faa39218 ("Merge tag 'drm-next-2020-06-02' of git://anongit.freedesktop.org/drm/drm"

) into android-mainline

Tiny merge resolutions along the way to 5.8-rc1.

Change-Id: I0036e22af4e398b0bb3b9855ff90d60b9c0227ee
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a64320f5 faa39218
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment