diff options
author | 2014-03-16 13:13:51 +0100 | |
---|---|---|
committer | 2014-03-16 13:13:51 +0100 | |
commit | 07b48c3ac539828d744f0562da1f24e8a234d06e (patch) | |
tree | bb1d32d025f97fc47f44a037951563c72eaf586d /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'drm-anon' into drm-next (diff) | |
parent | drm: make minors independent of global lock (diff) | |
download | linux-dev-07b48c3ac539828d744f0562da1f24e8a234d06e.tar.xz linux-dev-07b48c3ac539828d744f0562da1f24e8a234d06e.zip |
Merge branch 'drm-minor' into drm-next
Fix minor conflicts with drm-anon:
- allocation/free order
- drm_device header cleanups
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions