Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Feb 2010 18:20:25 +0000 (10:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Feb 2010 18:20:25 +0000 (10:20 -0800)
commit6556a6743549defc32e5f90ee2cb1ecd833a44c3
tree622306583d4a3c13235a8bfc012854c125c597f1
parente0d272429a34ff143bfa04ee8e29dd4eed2964c7
parent1dd2980d990068e20045b90c424518cc7f3657ff
Merge branch 'perf-core-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (172 commits)
  perf_event, amd: Fix spinlock initialization
  perf_event: Fix preempt warning in perf_clock()
  perf tools: Flush maps on COMM events
  perf_events, x86: Split PMU definitions into separate files
  perf annotate: Handle samples not at objdump output addr boundaries
  perf_events, x86: Remove superflous MSR writes
  perf_events: Simplify code by removing cpu argument to hw_perf_group_sched_in()
  perf_events, x86: AMD event scheduling
  perf_events: Add new start/stop PMU callbacks
  perf_events: Report the MMAP pgoff value in bytes
  perf annotate: Defer allocating sym_priv->hist array
  perf symbols: Improve debugging information about symtab origins
  perf top: Use a macro instead of a constant variable
  perf symbols: Check the right return variable
  perf/scripts: Tag syscall_name helper as not yet available
  perf/scripts: Add perf-trace-python Documentation
  perf/scripts: Remove unnecessary PyTuple resizes
  perf/scripts: Add syscall tracing scripts
  perf/scripts: Add Python scripting engine
  perf/scripts: Remove check-perf-trace from listed scripts
  ...

Fix trivial conflict in tools/perf/util/probe-event.c
18 files changed:
arch/x86/kernel/dumpstack_64.c
arch/x86/kernel/hw_breakpoint.c
arch/x86/kernel/ptrace.c
include/linux/ftrace.h
include/linux/ftrace_event.h
include/linux/perf_event.h
include/linux/syscalls.h
include/trace/ftrace.h
include/trace/syscall.h
init/Kconfig
kernel/perf_event.c
kernel/sched.c
kernel/trace/ftrace.c
kernel/trace/trace_kprobe.c
kernel/trace/trace_syscalls.c
tools/perf/builtin-top.c
tools/perf/util/event.c
tools/perf/util/probe-event.c