git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bc079e8
fa389e2
)
Merge tag 'v3.14-rc6' into drm-intel-next-queued
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Mon, 10 Mar 2014 20:43:46 +0000
(21:43 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Mon, 10 Mar 2014 20:43:46 +0000
(21:43 +0100)
Linux 3.14-rc6
I need the hdmi/dvi-dual link fixes in 3.14 to avoid ugly conflicts
when merging Ville's new hdmi cloning support into my -next tree
Conflicts:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/intel_dp.c
Makefile cleanup conflicts with an acpi build fix, intel_dp.c is
trivial.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Trivial merge