]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ec0f8c7) | 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)
commit31426e6f06310d0f8866e7854bfcc7e1b1271ef7
tree81df16530e078126e3f6452a8d3d07b6ea376874tree | snapshot
parentec0f8c737abaf216f9ca9bc1cb11b9f05f508c12commit | diff
drm: fix mismerge in drm_crtc.c

Daniel merged two things in 81cd2cdd35d1c717beb3572955ae9bcf4c533098,
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 Source Tree.