git.stricted.de - GitHub/exynos8895/android_kernel_samsung_universal8895.git/commit

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8f9cb50 2c6625c)

author	Dave Airlie <airlied@redhat.com>
	Mon, 17 Aug 2015 04:13:53 +0000 (14:13 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Mon, 17 Aug 2015 04:13:53 +0000 (14:13 +1000)
commit	4eebf60b7452fbd551fd7dece855ba7825a49cbc
tree	490b4d194ba09c90e10201ab7fc084a0bda0ed27	tree \| snapshot (tar.gz zip)
parent	8f9cb50789e76f3e224e8861adf650e55c747af4	commit \| diff
parent	2c6625cd545bdd66acff14f3394865d43920a5c7	commit \| diff

Merge tag 'v4.2-rc7' into drm-next

Linux 4.2-rc7

Backmerge master for i915 fixes

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_atomic_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_bios.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp_mst.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_uncore.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_drm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_ttm.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	diff1 \|	diff2 \|	blob \| history
include/drm/drmP.h	diff1 \|	diff2 \|	blob \| history
include/drm/drm_crtc_helper.h	diff1 \|	diff2 \|	blob \| history
include/uapi/drm/i915_drm.h	diff1 \|	diff2 \|	blob \| history