Merge tag 'v3.16' into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 4 Aug 2014 23:04:59 +0000 (09:04 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 4 Aug 2014 23:04:59 +0000 (09:04 +1000)
commit5d42f82a9b8c5168d75cf59307cd271feca94464
treea7049189a2c814589b3ad7e6e776fb736f980967
parentc759606c96dc052373d4c36ea383595da46b04e9
parent19583ca584d6f574384e17fe7613dfaeadcdc4a6
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
arch/arm/boot/dts/exynos5420.dtsi
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_stolen.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_dsi.c
drivers/gpu/drm/i915/intel_lvds.c
drivers/gpu/drm/i915/intel_opregion.c
drivers/gpu/drm/i915/intel_panel.c
drivers/gpu/drm/nouveau/nouveau_fbcon.c