git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
382ab78
bbf0c6b
)
Merge branch 'drm-intel-fixes' into drm-intel-next
author
Chris Wilson
<chris@chris-wilson.co.uk>
Sun, 5 Dec 2010 10:43:39 +0000
(10:43 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Sun, 5 Dec 2010 10:43:39 +0000
(10:43 +0000)
Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
include/drm/i915_drm.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff