git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4877776
e05444b
)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Tue, 29 Jul 2014 18:49:36 +0000
(20:49 +0200)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Tue, 29 Jul 2014 18:49:36 +0000
(20:49 +0200)
Pull in drm-next with Dave's DP MST support so that I can merge some
conflicting patches which also touch the driver load sequencing around
interrupt handling.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff