Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@kernel.org>
Sat, 8 Dec 2012 14:54:35 +0000 (15:54 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 8 Dec 2012 14:54:35 +0000 (15:54 +0100)
commitcc1b39dbf9f55a438e8a21a694394c20e6a17129
treecf48e5c871250c2bfd1d0590acd2f0569e95b950
parent7e0dd574cd6b1bcc818ed4251e5ceda7d8bee08f
parent1c7d66732458dc187008e3f5b2f71e019e320fc2
Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-trace into perf/core

Pull ftrace updates from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/unicore32/include/asm/Kbuild