Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

Pull ftrace updates from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined arch/unicore32/include/asm/Kbuild
index 601e92f18af6d85d5bb314733e409f97436df804,7be503e4569589fc318b7f7e727c27f5c5718ace..89d8b6c4e39a09d5739bf215f4ce4c663a9f2ef3
--- 1/arch/unicore32/include/asm/Kbuild
--- 2/arch/unicore32/include/asm/Kbuild
+++ b/arch/unicore32/include/asm/Kbuild
@@@ -1,3 -1,4 +1,3 @@@
 -include include/asm-generic/Kbuild.asm
  
  generic-y += atomic.h
  generic-y += auxvec.h
@@@ -53,6 -54,7 +53,7 @@@ generic-y += syscalls.
  generic-y += termbits.h
  generic-y += termios.h
  generic-y += topology.h
+ generic-y += trace_clock.h
  generic-y += types.h
  generic-y += ucontext.h
  generic-y += unaligned.h