From: Dave Airlie <airlied@linux.ie>
Date: Wed, 2 Sep 2009 04:00:11 +0000 (+1000)
Subject: drm/crtc: fix mismerge of last patch.
X-Git-Tag: v2.6.32-rc1~52^2~81
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c552dd79346f86a3b53e41255c92c6f560b80fb;p=pandora-kernel.git

drm/crtc: fix mismerge of last patch.

We only want to NULL encoder->crtc when it is off.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

Reading git-diff-tree failed