]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: adc3184) | patch
drm: fix mismerge in drm_crtc.c
authorDave Airlie <airlied@redhat.com>
Mon, 12 Jan 2015 21:38:53 +0000 (07:38 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 12 Jan 2015 21:38:53 +0000 (07:38 +1000)
commit426959c945538bace94ccc590d8630c02ecd6b0f
tree81df16530e078126e3f6452a8d3d07b6ea376874tree | snapshot
parentadc31849b27fefeca6c225d3895143a2ec6970facommit | diff
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>
drivers/gpu/drm/drm_crtc.c diff | blob | history
Linux kernel for KaRo TX COM modules