Ingo Molnar ff1fb5f6b4 Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent ... Pull two fixes from Steven Rostedt. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2013-02-20 11:26:21 +01:00
..
asm	Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent	2013-02-20 11:26:21 +01:00
uapi/asm	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-02-19 17:49:41 -08:00