git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a08c07
)
drm/radeon/kms: merge conflicted badly
author
Dave Airlie
<airlied@redhat.com>
Thu, 20 Mar 2014 01:08:11 +0000
(11:08 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Thu, 20 Mar 2014 01:09:10 +0000
(11:09 +1000)
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>
No differences found