git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c59a333
467cffb
)
Merge branch 'drm-intel-fixes' into drm-intel-next
author
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 7 Mar 2011 12:32:44 +0000
(12:32 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 7 Mar 2011 12:35:15 +0000
(12:35 +0000)
Apply the trivial conflicting regression fixes, but keep GPU semaphores
enabled.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_execbuffer.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff