Merge tag 'drm-for-v4.12' of git://people.freedesktop.org/~airlied/linux into drm...

Backmerging Dave's 'drm-for-v4.12' pull request now that it's landed. There are
a bunch of non-drm changes which are just random bits we hadn't yet picked up in
misc-next.

main drm pull request for 4.12 kernel

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/CAPM=9ty0jHgzG18zOr5CYODyTqZfH55kOCOFqNnXiWnTb_uNWw@mail.gmail.com

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
Simple merge