]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
Merge airlied/drm-next into drm-misc-next
authorSean Paul <seanpaul@chromium.org>
Wed, 26 Jul 2017 22:39:07 +0000 (18:39 -0400)
committerSean Paul <seanpaul@chromium.org>
Wed, 26 Jul 2017 22:39:07 +0000 (18:39 -0400)
commit78acea381d6eb1c67b155e7e2638ba3b1728eb07
tree323b89e2f43f5f177223aeb61a6a18fe12eda011
parent67022227ffb1f588e70deeccc9246ec93e26f980
parente6742e1021a5cec55fab50a0b115c65217488eda
Merge airlied/drm-next into drm-misc-next

Backmerge drm-next with -rc2 in it to pull in a couple stm patches that
were previously incorrectly applied to -misc-next. By picking them up in
the correct manner, git will hopefully fix any errant trees that are out
in the wild.

Signed-off-by: Sean Paul <seanpaul@chromium.org>