git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8d19215
5588978
)
Merge branch 'drm-intel-fixes' into drm-intel-next
author
Chris Wilson
<chris@chris-wilson.co.uk>
Tue, 2 Nov 2010 10:53:29 +0000
(10:53 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Tue, 2 Nov 2010 10:53:29 +0000
(10:53 +0000)
Immediate merge to resolve conflicts from applying a stability fix to
both branches.
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_ringbuffer.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff