git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c9c2625
90aca4d
)
Merge branch 'drm-radeon-lockup' into drm-core-next
author
Dave Airlie
<airlied@redhat.com>
Tue, 20 Apr 2010 03:15:05 +0000
(13:15 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 20 Apr 2010 03:15:05 +0000
(13:15 +1000)
* drm-radeon-lockup:
drm/radeon/kms: simplify & improve GPU reset V2
drm/radeon/kms: rename gpu_reset to asic_reset
drm/radeon/kms: fence cleanup + more reliable GPU lockup detection V4
Conflicts:
drivers/gpu/drm/radeon/r300.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff