Merge remote-tracking branch 'origin/drm-intel-next-queued' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 15 Jun 2015 05:26:47 +0000 (07:26 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 15 Jun 2015 05:28:19 +0000 (07:28 +0200)
Pull in patches Jani applied while I was on vacation.

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

Trivial merge