From: Dave Airlie <airlied@redhat.com>
Date: Thu, 20 Mar 2014 01:08:11 +0000 (+1000)
Subject: drm/radeon/kms: merge conflicted badly
X-Git-Tag: v3.15-rc1~51^2~49
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e84c20aff1ce7493bce26b75f1db363bb3f05979;p=pandora-kernel.git

drm/radeon/kms: merge conflicted badly

Not sure why git didn't flag this, but the result of automerge
from 3.14-rc7 screwed up the radeon init procedure.

Reported-by: Fireburn on #radeon
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

Reading git-diff-tree failed