git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c759606 19583ca)

author	Dave Airlie <airlied@redhat.com>
	Mon, 4 Aug 2014 23:04:59 +0000 (09:04 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Mon, 4 Aug 2014 23:04:59 +0000 (09:04 +1000)
commit	5d42f82a9b8c5168d75cf59307cd271feca94464
tree	a7049189a2c814589b3ad7e6e776fb736f980967	tree \| snapshot (tar.gz zip)
parent	c759606c96dc052373d4c36ea383595da46b04e9	commit \| diff
parent	19583ca584d6f574384e17fe7613dfaeadcdc4a6	commit \| diff

Merge tag 'v3.16' into drm-next

Linux 3.16

backmerge requested by i915, nouveau and radeon authors

Conflicts:
drivers/gpu/drm/i915/i915_gem_render_state.c
drivers/gpu/drm/i915/intel_drv.h

15 files changed:

arch/arm/boot/dts/exynos4.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/exynos5420.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	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/i915_reg.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_lvds.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_opregion.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_fbcon.c	diff1 \|	diff2 \|	blob \| history