tree ec97ee26c9715f8da24377e9cacc63261b0aa2ab
parent 40a4a5727f21a0e439d317aa99953e24467605eb
parent 2d4df13c0f9ef56452b1d9a9016cb3946e17bfe5
author Daniel Vetter <daniel.vetter@ffwll.ch> 1443595661 +0200
committer Daniel Vetter <daniel.vetter@ffwll.ch> 1443595661 +0200

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

Backmerge to catch up with 4.3. slightly more involved conflict in the
irq code, but nothing beyond adjacent changes.

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