]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge tag 'v3.18-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 2 Dec 2014 00:58:33 +0000 (10:58 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 2 Dec 2014 00:58:33 +0000 (10:58 +1000)
commite8115e79aa62b6ebdb3e8e61ca4092cc32938afc
tree42b791ab54ef9d5c73dcd49f907b8b37fa2f7e19
parent9be23ae4350bfd71c0cc2ea3494671ee90e5603b
parent009d0431c3914de64666bec0d350e54fdd59df6a
Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/tegra/dc.c
23 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
arch/arm/boot/dts/r8a7790.dtsi
arch/arm/mach-shmobile/clock-r8a7740.c
arch/arm/mach-shmobile/clock-r8a7790.c
arch/arm/mach-shmobile/setup-sh73a0.c
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_gem_tiling.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_panel.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/nouveau/nv50_display.c
drivers/gpu/drm/radeon/cik.c
drivers/gpu/drm/radeon/cik_sdma.c
drivers/gpu/drm/radeon/r600_dma.c
drivers/gpu/drm/radeon/r600_dpm.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/si.c
drivers/gpu/drm/tegra/dc.c
kernel/events/uprobes.c