diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-18 09:43:56 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-18 09:43:56 +0100 |
| commit | e19b9137142988bec5a76c5f8bdf12a77ea802b0 (patch) | |
| tree | b36c83fa93da7f18c1331252fb82a87431697443 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | drm/i915: Go OCD on the Makefile (diff) | |
| parent | Merge branch 'drm-minor' of git://people.freedesktop.org/~dvdhrm/linux into drm-next (diff) | |
| download | linux-dev-e19b9137142988bec5a76c5f8bdf12a77ea802b0.tar.xz linux-dev-e19b9137142988bec5a76c5f8bdf12a77ea802b0.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/Makefile
Makefile cleanup in drm-intel-next conflicts with a build-fix to move
intel_opregion under CONFIG_ACPI.
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