Merge commit '75d04a3773ecee617847de963ae4195d6aa74c28' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 4 May 2015 07:25:12 +0000 (09:25 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 4 May 2015 07:25:12 +0000 (09:25 +0200)
Pull in patches Jani applied while I was on vacation.

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

Trivial merge