projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f2887ee 048509a)
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)
commit08e19ba8c1d8f6c67b234b10dbc50925529272b6
treeeb006541f40528f51334eefc725f155c4ce386a6tree | snapshot
parentf2887ee42a6114b36f3feae3f57d1616387958e4commit | diff
parent048509a32a5445b6d6ea284dbb400133944c6213commit | diff
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 diff1 | diff2 | blob | history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c diff1 | diff2 | blob | history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_debugfs.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_gem.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gem_gtt.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gem_stolen.c 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_lrc.c diff1 | diff2 | blob | history
drivers/gpu/drm/msm/msm_atomic.c diff1 | diff2 | blob | history
drivers/gpu/drm/tegra/dc.c diff1 | diff2 | blob | history
include/drm/i915_pciids.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.