diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-29 20:49:36 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-29 20:49:36 +0200 |
| commit | 4dac3edfe68e5e1b3c2216b84ba160572420fa40 (patch) | |
| tree | 924c0d117dbcc6d374eea603ed64e627b35b043b /tools/perf/scripts/python/call-graph-from-postgresql.py | |
| parent | drm/i915/userptr: Keep spin_lock/unlock in the same block (diff) | |
| parent | drm/i915: fix initial fbdev setup warnings (diff) | |
| download | linux-dev-4dac3edfe68e5e1b3c2216b84ba160572420fa40.tar.xz linux-dev-4dac3edfe68e5e1b3c2216b84ba160572420fa40.zip | |
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>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions