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)
commit5e1249ff36d29653dde09fedf1d04a4ecff028c2
tree900c8f019139e9be4d4fe403cbe67d4dfd487f92
parenta2ee48d60eed9cfb6447a4233370aee4ea88108b
parentfe4c63c8cbd22251f8ce8bcb7853e46385f7af82
Merge remote-tracking branch 'origin/drm-intel-next-queued' into drm-intel-next-queued

Pull in patches Jani applied while I was on vacation.

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