From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 15 Jun 2015 05:26:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/drm-intel-next-queued' into drm-intel-next-queued
X-Git-Tag: v4.3-rc1~75^2~36^2~307
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5e1249ff36d29653dde09fedf1d04a4ecff028c2;p=users%2Fjedix%2Flinux-maple.git

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>
---

5e1249ff36d29653dde09fedf1d04a4ecff028c2