Dave Airlie e8115e79aa 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

2014-12-02 10:58:33 +10:00

..

callchain.c

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

core.c

perf: Fix corruption of sibling list with hotplug

2014-11-16 09:45:46 +01:00

hw_breakpoint.c

perf: Fix and clean up initialization of pmu::event_idx

2014-10-28 10:51:01 +01:00

internal.h

perf: Fix arch_perf_out_copy_user default

2013-11-06 12:34:25 +01:00

Makefile

uprobes: Move to kernel/events/

2012-02-22 11:08:00 +01:00

ring_buffer.c

perf: Optimize ring-buffer write by depending on control dependencies

2013-12-11 15:53:22 +01:00

uprobes.c

Merge tag 'v3.18-rc7' into drm-next

2014-12-02 10:58:33 +10:00