From: Jani Nikula <jani.nikula@intel.com>
Date: Thu, 4 Jun 2015 07:26:17 +0000 (+0300)
Subject: Merge remote-tracking branch 'drm-upstream/drm-next' into drm-intel-next-queued
X-Git-Tag: v4.3-rc1~75^2~36^2~307^2~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ccb6662b7ed7690313bcb066f4533d1f641ba72c;p=karo-tx-linux.git

Merge remote-tracking branch 'drm-upstream/drm-next' into drm-intel-next-queued

Backmerge drm-next so I can apply Maarten's drm/i915 atomic conversion
patches.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

ccb6662b7ed7690313bcb066f4533d1f641ba72c