| commit | ccb6662b7ed7690313bcb066f4533d1f641ba72c | [log] [tgz] |
|---|---|---|
| author | Jani Nikula <jani.nikula@intel.com> | Thu Jun 04 10:26:17 2015 +0300 |
| committer | Jani Nikula <jani.nikula@intel.com> | Thu Jun 04 10:30:19 2015 +0300 |
| tree | 619270f108afe28824463be2fe82c749f4ddc2f0 | |
| parent | 2441f8779e886d74389bf78aad149dc99876a900 [diff] | |
| parent | 63e1456122761745082d325329ccce749a426059 [diff] |
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>