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-Url: http://drtracing.org/?a=commitdiff_plain;h=ccb6662b7ed7690313bcb066f4533d1f641ba72c;p=deliverable%2Flinux.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