diff options
| author |   Dave Airlie <airlied@redhat.com> | 2015-03-09 19:58:30 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-09 19:58:30 +1000 |
| commit | a8c6ecb3be7029881f7c95e5e201a629094a4e1a (patch) | |
| tree | eb006541f40528f51334eefc725f155c4ce386a6 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge tag 'drm-intel-next-2015-02-27' of git://anongit.freedesktop.org/drm-intel into drm-next (diff) | |
| parent | Linux 4.0-rc3 (diff) | |
| download | linux-dev-a8c6ecb3be7029881f7c95e5e201a629094a4e1a.tar.xz linux-dev-a8c6ecb3be7029881f7c95e5e201a629094a4e1a.zip | |
Merge tag 'v4.0-rc3' into drm-next
Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions