| commit | 4dac3edfe68e5e1b3c2216b84ba160572420fa40 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Jul 29 20:49:36 2014 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Jul 29 20:49:36 2014 +0200 |
| tree | 924c0d117dbcc6d374eea603ed64e627b35b043b | |
| parent | 487777673e355ab9f0b7cac4ad1207be9d36156f [diff] | |
| parent | e05444be705b5c7c7f85d7722b6f97f3a6732d54 [diff] |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next Pull in drm-next with Dave's DP MST support so that I can merge some conflicting patches which also touch the driver load sequencing around interrupt handling. Conflicts: drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_dp.c Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>