git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
27b6c12
8abdc17
)
Merge branch 'topic/soix' into drm-intel-next-queued
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 18 Jun 2014 09:44:05 +0000
(11:44 +0200)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 18 Jun 2014 09:44:05 +0000
(11:44 +0200)
Jesse's SOix work required some patches from acpi-next, so pull it in
through a topic barnch.
Conflicts:
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff