diff options
author | 2015-01-13 07:38:53 +1000 | |
---|---|---|
committer | 2015-01-13 07:38:53 +1000 | |
commit | 426959c945538bace94ccc590d8630c02ecd6b0f (patch) | |
tree | 81df16530e078126e3f6452a8d3d07b6ea376874 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge tag 'drm-intel-next-2014-12-19' of git://anongit.freedesktop.org/drm-intel into drm-next (diff) | |
download | linux-dev-426959c945538bace94ccc590d8630c02ecd6b0f.tar.xz linux-dev-426959c945538bace94ccc590d8630c02ecd6b0f.zip |
drm: fix mismerge in drm_crtc.c
Daniel merged two things in 72a3697097b8dc92f5b8362598f5730a9986eb83,
but he merged this code twice, Dan's static checker spotted it.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions