Merge branch 'linus' into perf/core

Merge reason: Pick up the latest perf fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/powerpc/kernel/perf_event.c
Simple merge

diff --cc arch/sparc/kernel/perf_event.c
Simple merge

diff --cc arch/x86/kernel/kprobes.c
Simple merge

diff --cc include/linux/syscalls.h
Simple merge

diff --cc tools/perf/builtin-report.c
Simple merge

diff --cc tools/perf/util/callchain.c
Simple merge

diff --cc tools/perf/util/callchain.h
index 809850f,f2e9ee1..624a96c
--- 1/tools/perf/util/callchain.h
--- 2/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@@ -58,7 -61,7 +61,7 @@@ static inline u64 cumul_hits(struct cal
  
  int register_callchain_param(struct callchain_param *param);
  int append_chain(struct callchain_node *root, struct ip_callchain *chain,
-                struct map_symbol *syms);
+                struct map_symbol *syms, u64 period);
  
 -bool ip_callchain__valid(struct ip_callchain *chain, event_t *event);
 +bool ip_callchain__valid(struct ip_callchain *chain, const event_t *event);
  #endif        /* __PERF_CALLCHAIN_H */