git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5a9a8d1
d315777
)
Merge remote branch 'linus/master' into drm-intel-fixes
author
Chris Wilson
<chris@chris-wilson.co.uk>
Sun, 23 Jan 2011 17:22:16 +0000
(17:22 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 24 Jan 2011 18:27:32 +0000
(18:27 +0000)
Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff