Merge drm/drm-next into drm-misc-next
authorSean Paul <seanpaul@chromium.org>
Wed, 10 Apr 2019 19:50:49 +0000 (15:50 -0400)
committerSean Paul <seanpaul@chromium.org>
Wed, 10 Apr 2019 19:50:49 +0000 (15:50 -0400)
commit3bfaf1f7044c6a3b1e00fcad2d0529f0da449d67
tree490bc7e8aa29c2ee41eb4813683f1aa23971abd3
parent669105a74a287b14cdec04c64eb51db1bb890f64
parent14d2bd53a47a7e1cb3e03d00a6b952734cf90f3f
Merge drm/drm-next into drm-misc-next

Finally have a reason for a backmerge other than "it's been a while"!

Backmerging drm-next to -misc-next to facilitate Rob Herring's work on
Panfrost.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
MAINTAINERS
drivers/gpu/drm/Makefile
drivers/gpu/drm/bochs/bochs.h