git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: adc3184)
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)
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 patch | blob | history

diff --cc drivers/gpu/drm/drm_crtc.c
Simple merge
Pandora Kernel Repository