]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbeef1402b37d145e71084d174dcc302b3953539b
tree619270f108afe28824463be2fe82c749f4ddc2f0
parent6476bbe24b427c354e92e42aebfef8ed183cb528
parent631bd038c2fb6db5c42fb7e7bfa09f2545eaade2
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