diff options
author | 2016-06-02 09:54:12 +0200 | |
---|---|---|
committer | 2016-06-02 09:54:12 +0200 | |
commit | 5599617ec0719dba3b1f85a4abca2a6c93368ae3 (patch) | |
tree | 7d2f9bb6a538ee8ed5cfa391f2cfa72a3e2daa9f /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | drm/i915/skl+: Use scaling amount for plane data rate calculation (v4) (diff) | |
parent | Merge branch 'drm-intel-next' of git://anongit.freedesktop.org/drm-intel into drm-next (diff) | |
download | wireguard-linux-5599617ec0719dba3b1f85a4abca2a6c93368ae3.tar.xz wireguard-linux-5599617ec0719dba3b1f85a4abca2a6c93368ae3.zip |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Git got absolutely destroyed with all our cherry-picking from
drm-intel-next-queued to various branches. It ended up inserting
intel_crtc_page_flip 2x even in intel_display.c.
Backmerge to get back to sanity.
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