]> 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)
commit562126becd8c1f58e8040b3aabdc7e576f310814
tree619270f108afe28824463be2fe82c749f4ddc2f0
parent2d6afd17e24f35afb46bf4550520890d9a85d761
parent395e79bbab341936068714fc23906d598f9ed7cb
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