From e84c20aff1ce7493bce26b75f1db363bb3f05979 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 20 Mar 2014 11:08:11 +1000
Subject: [PATCH] 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-format-patch failed