tree bc27744497735062f372ac7b67a0d81b96d24c75
parent 62b695662a2413286a25df418b0af665bf2899c5
parent 64a577196d66b44e37384bc5c4d78c61f59d5b2a
author Daniel Vetter <daniel.vetter@ffwll.ch> 1488184211 +0100
committer Daniel Vetter <daniel.vetter@ffwll.ch> 1488184211 +0100

Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>