diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-10 12:44:43 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-10-10 12:44:43 +0200 |
| commit | 967ad7f1489da7babbe0746f81c283458ecd3f84 (patch) | |
| tree | 812608fd6efcfe81096bd51b1ec1c2a4167385f6 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | drm/i915: Use adjusted_mode in the fastboot hack to disable pfit (diff) | |
| parent | drm/i915/dp: get rid of intel_dp->link_configuration (diff) | |
| download | linux-dev-967ad7f1489da7babbe0746f81c283458ecd3f84.tar.xz linux-dev-967ad7f1489da7babbe0746f81c283458ecd3f84.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
The conflict in intel_drv.h tripped me up a bit since a patch in dinq
moves all the functions around, but another one in drm-next removes a
single function. So I'ev figured backing this into a backmerge would
be good.
i915_dma.c is just adjacent lines changed, nothing nefarious there.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_drv.h
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions