Merge arlied/drm-next into drm-misc-next
authorGustavo Padovan <gustavo.padovan@collabora.com>
Mon, 4 Dec 2017 18:04:45 +0000 (16:04 -0200)
committerGustavo Padovan <gustavo.padovan@collabora.com>
Mon, 4 Dec 2017 18:04:45 +0000 (16:04 -0200)
commit7b47c66cfa203288c43851260edeeb0fae56f692
treefa729735fdaf1d77fbbf13062fd53c31b59d682d
parentca0e68e21aae10220eff71a297e7d794425add77
parentca797d29cd63e7b71b4eea29aff3b1cefd1ecb59
Merge arlied/drm-next into drm-misc-next

We need to pull 66660d4cf21b (drm: add connector info/property for
non-desktop displays [v2]) into drm-misc-next to continue the development
of the display rotation series.

Effectively this also pulls 4.15-r2 into drm-misc-next.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/gpu/todo.rst
MAINTAINERS
drivers/gpu/drm/arm/malidp_drv.c
include/drm/drm_mode_config.h