git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fe16d94
4528583
)
Merge branch 'drm-intel-fixes' into drm-intel-next
author
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 16 Feb 2011 09:36:05 +0000
(09:36 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 16 Feb 2011 09:44:30 +0000
(09:44 +0000)
Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff