]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7713d79) | 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)
commit81998d772a0239fe8e7fff3950e51e4c48ba7acc
treea04e109899142ce637b182f103cc9bfbdec18d1btree | snapshot
parent7713d79faa97e77a04d89497ef9369649aba38d7commit | 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
Linux Kernel Source Tree.