Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next

Backmerge to resync and also so that Ville can apply a cleanup patch
from Takashi.

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