From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 4 May 2015 07:25:12 +0000 (+0200)
Subject: Merge commit '75d04a3773ecee617847de963ae4195d6aa74c28' into drm-intel-next-queued
X-Git-Tag: v4.2-rc1~13^2~58^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93a96c6f049d047bc196890fc4284eff15b3770f;p=thirdparty%2Fkernel%2Flinux.git

Merge commit '75d04a3773ecee617847de963ae4195d6aa74c28' into drm-intel-next-queued

Pull in patches Jani applied while I was on vacation.

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

93a96c6f049d047bc196890fc4284eff15b3770f