| commit | e84c20aff1ce7493bce26b75f1db363bb3f05979 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Mar 20 11:08:11 2014 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Mar 20 11:09:10 2014 +1000 |
| tree | a04e109899142ce637b182f103cc9bfbdec18d1b | |
| parent | 5a08c07526e9586318c5b57fd90af4350f83e26e [diff] |
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>