git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Dave Airlie <airlied@redhat.com>
	Tue, 2 Dec 2014 00:58:33 +0000 (10:58 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 2 Dec 2014 00:58:33 +0000 (10:58 +1000)
commit	e8115e79aa62b6ebdb3e8e61ca4092cc32938afc
tree	42b791ab54ef9d5c73dcd49f907b8b37fa2f7e19	tree \| snapshot
parent	9be23ae4350bfd71c0cc2ea3494671ee90e5603b	commit \| diff
parent	009d0431c3914de64666bec0d350e54fdd59df6a	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/r8a7790.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7740.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7790.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-sh73a0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_tiling.c	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_panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik_sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600_dpm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/si.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/dc.c	diff1 \|	diff2 \|	blob \| history
kernel/events/uprobes.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

RSS Atom

Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/r8a7790.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7740.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/clock-r8a7790.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/setup-sh73a0.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_gtt.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem_tiling.c	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_panel.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/cik_sdma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/r600_dpm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/si.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/tegra/dc.c	diff1 \|	diff2 \|	blob \| history
kernel/events/uprobes.c	diff1 \|	diff2 \|	blob \| history