diff options
author | 2016-03-14 09:42:34 +1000 | |
---|---|---|
committer | 2016-03-14 09:46:02 +1000 | |
commit | 9b61c0fcdf0cfd20a85d9856d46142e7f297de0a (patch) | |
tree | d4abe6aa3f4e1e088f9da1d0597e078b1fe58912 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
parent | Merge tag 'drm-intel-fixes-2016-03-11' of git://anongit.freedesktop.org/drm-intel into drm-next (diff) | |
download | linux-dev-9b61c0fcdf0cfd20a85d9856d46142e7f297de0a.tar.xz linux-dev-9b61c0fcdf0cfd20a85d9856d46142e7f297de0a.zip |
Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions