git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c4a1d9e
4ab0fbd
)
Merge branch 'drm-intel-fixes' into drm-intel-next
author
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 22 Nov 2010 08:51:36 +0000
(08:51 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 22 Nov 2010 08:51:36 +0000
(08:51 +0000)
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
Trivial merge