git.stricted.de - GitHub/moto-9609/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8dd0eb3 9eccca0)

author	Dave Airlie <airlied@redhat.com>
	Mon, 9 Mar 2015 09:58:30 +0000 (19:58 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Mon, 9 Mar 2015 09:58:30 +0000 (19:58 +1000)
commit	a8c6ecb3be7029881f7c95e5e201a629094a4e1a
tree	eb006541f40528f51334eefc725f155c4ce386a6	tree \| snapshot (tar.gz zip)
parent	8dd0eb3566711d81bfbe2b4421b33f0dd723cec4	commit \| diff
parent	9eccca0843205f87c00404b663188b88eb248051	commit \| 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