Ingo Molnar 83bc90e115 Merge branch 'linus' into perf/core, to fix conflicts ... Conflicts: arch/x86/kernel/cpu/perf_event_intel_uncore*.c Signed-off-by: Ingo Molnar <mingo@kernel.org>		2014-08-24 22:32:24 +02:00
..
callchain.c	perf: Roll back callchain buffer refcount under the callchain mutex	2013-08-16 17:55:50 +02:00
core.c	perf: Add PERF_EVENT_STATE_EXIT state for events with exited task	2014-08-24 08:11:09 -03:00
hw_breakpoint.c	hw_breakpoint: Introduce "struct bp_cpuinfo"	2013-06-20 17:58:57 +02: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	mm: memcontrol: rewrite charge API	2014-08-08 15:57:17 -07:00