Frederic Weisbecker c032862fba Merge commit '8700c95adb03' into timers/nohz ... The full dynticks tree needs the latest RCU and sched upstream updates in order to fix some dependencies. Merge a common upstream merge point that has these updates. Conflicts: include/linux/perf_event.h kernel/rcutree.h kernel/rcutree_plugin.h Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>		2013-05-02 17:54:19 +02:00
..
callchain.c	perf: Add attribute to filter out callchains	2012-08-10 12:40:57 -03:00
core.c	Merge commit '8700c95adb03' into timers/nohz	2013-05-02 17:54:19 +02:00
hw_breakpoint.c	perf/hwbp: Fix cleanup in case of kzalloc failure	2013-02-14 17:06:39 -03:00
internal.h	perf: Fix ring_buffer perf_output_space() boundary calculation	2013-03-21 12:04:35 +01:00
Makefile	uprobes: Move to kernel/events/	2012-02-22 11:08:00 +01:00
ring_buffer.c	perf: Fix ring_buffer perf_output_space() boundary calculation	2013-03-21 12:04:35 +01:00
uprobes.c	uretprobes: Remove -ENOSYS as return probes implemented	2013-04-13 15:31:58 +02:00