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)
Backmerge drm-next so I can apply Maarten's drm/i915 atomic conversion
patches.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1  2 
drivers/gpu/drm/i915/intel_display.c

Simple merge