git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0f8c6d7
c6afd65
)
Merge branch 'drm-intel-fixes' into drm-intel-next
author
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 1 Nov 2010 13:42:29 +0000
(13:42 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 1 Nov 2010 13:44:41 +0000
(13:44 +0000)
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_evict.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff