diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-01-30 12:56:51 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-01-30 12:56:51 +0100 |
| commit | e515b47e5646154448e46231d811919d93923da5 (patch) | |
| tree | 1b10297d37170a1e00b4f2211f4296c2b0020f8d /scripts/basic | |
| parent | drm/i915: Kerneldoc for i915_gem_evict.c (diff) | |
| parent | Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next (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>
Diffstat (limited to 'scripts/basic')
0 files changed, 0 insertions, 0 deletions