git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit

]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit

projects / mirror_ubuntu-bionic-kernel.git / commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 26 Jul 2017 11:23:10 +0000 (13:23 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 26 Jul 2017 11:43:33 +0000 (13:43 +0200)
commit	af055598542670c8533a58582813b1419949cae0
tree	901fa1bf635d5c1e91d08f9f4c2e4943516dbb71	tree
parent	9f15a4ab19ab33658dbc9fd37be5210e8c1ac622	commit \| diff
parent	2d62c799f8ffac4f7ffba6a4e7f148827dfc24c7	commit \| diff

Merge airlied/drm-next into drm-misc-next

I need this to be able to apply the deferred fbdev setup patches, I
need the relevant prep work that landed through the drm-intel tree.

Also squash in conflict fixup from Laurent Pinchart.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

20 files changed:

Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bridge/panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_framebuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_internal.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_ioc32.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_syncobj.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_vblank.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mediatek/mtk_drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mediatek/mtk_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mediatek/mtk_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_drv.c	diff1 \|	diff2 \|	blob \| history

ubuntu-bionic-kernel mirror

RSS Atom

Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bridge/panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_framebuffer.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_internal.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_ioc32.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_syncobj.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_vblank.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mediatek/mtk_drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mediatek/mtk_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/mediatek/mtk_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_drv.c	diff1 \|	diff2 \|	blob \| history