]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge tag 'v4.0-rc3' into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 9 Mar 2015 09:58:30 +0000 (19:58 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 9 Mar 2015 09:58:30 +0000 (19:58 +1000)
commita8c6ecb3be7029881f7c95e5e201a629094a4e1a
treeeb006541f40528f51334eefc725f155c4ce386a6
parent8dd0eb3566711d81bfbe2b4421b33f0dd723cec4
parent9eccca0843205f87c00404b663188b88eb248051
Merge tag 'v4.0-rc3' into drm-next

Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box

Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
16 files changed:
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_gem_stolen.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_lrc.c
drivers/gpu/drm/msm/msm_atomic.c
drivers/gpu/drm/tegra/dc.c
include/drm/i915_pciids.h