git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3d8620c
722154e
)
Merge remote branch 'origin/master' into drm-intel-next
author
Eric Anholt
<eric@anholt.net>
Fri, 7 May 2010 21:30:03 +0000
(14:30 -0700)
committer
Eric Anholt
<eric@anholt.net>
Mon, 10 May 2010 20:36:52 +0000
(13:36 -0700)
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/radeon/r300.c
The BSD ringbuffer support that is landing in this branch
significantly conflicts with the Ironlake PIPE_CONTROL fix on master,
and requires it to be tested successfully anyway.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff