diff options
author | 2016-06-16 14:18:30 +0200 | |
---|---|---|
committer | 2016-06-16 14:18:30 +0200 | |
commit | c19941218c9a1cae578dfbf30190b13b9cdb9aa8 (patch) | |
tree | 0014d2ac89e6209c565f5a8fc53abd8dce13e63e /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | drm/i915/ilk: Don't disable SSC source if it's in use (diff) | |
parent | Merge tag 'topic/drm-misc-2016-06-15' of git://anongit.freedesktop.org/drm-intel into drm-next (diff) | |
download | linux-dev-c19941218c9a1cae578dfbf30190b13b9cdb9aa8.tar.xz linux-dev-c19941218c9a1cae578dfbf30190b13b9cdb9aa8.zip |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next to get at the nonblocking atomic helpers, needed to
merge the i915 conversion.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions