From: Dave Airlie <airlied@redhat.com>
Date: Mon, 12 Jan 2015 21:38:53 +0000 (+1000)
Subject: drm: fix mismerge in drm_crtc.c
X-Git-Tag: fixes-v4.0-rc1~91^2~42
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=426959c945538bace94ccc590d8630c02ecd6b0f;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed