| commit | e515b47e5646154448e46231d811919d93923da5 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Jan 30 12:56:51 2014 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Thu Jan 30 12:56:51 2014 +0100 |
| tree | 1b10297d37170a1e00b4f2211f4296c2b0020f8d | |
| parent | c2c1d4912cd7028384d7f25d2faefefb8958f64d [diff] | |
| parent | ef64cf9d06049e4e9df661f3be60b217e476bee1 [diff] |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued Backmerge drm-next - I need to backmerge drm-intel-fixes patches touching the error capture code to be able to merge Ben's cleanup patches. Conflicts: drivers/gpu/drm/i915/i915_gpu_error.c Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>