projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5a08c07) | patch
drm/radeon/kms: merge conflicted badly
authorDave Airlie <airlied@redhat.com>
Thu, 20 Mar 2014 01:08:11 +0000 (11:08 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 20 Mar 2014 01:09:10 +0000 (11:09 +1000)
commite84c20aff1ce7493bce26b75f1db363bb3f05979
treea04e109899142ce637b182f103cc9bfbdec18d1btree | snapshot
parent5a08c07526e9586318c5b57fd90af4350f83e26ecommit | 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>
drivers/gpu/drm/radeon/radeon_kms.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.