Merge remote-tracking branch 'drm-upstream/drm-next' into drm-intel-next-queued
authorJani Nikula <jani.nikula@intel.com>
Thu, 4 Jun 2015 07:26:17 +0000 (10:26 +0300)
committerJani Nikula <jani.nikula@intel.com>
Thu, 4 Jun 2015 07:30:19 +0000 (10:30 +0300)
commitccb6662b7ed7690313bcb066f4533d1f641ba72c
tree619270f108afe28824463be2fe82c749f4ddc2f0
parent2441f8779e886d74389bf78aad149dc99876a900
parent63e1456122761745082d325329ccce749a426059
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>
drivers/gpu/drm/i915/intel_display.c