tree 2e5982fef1e737ce5f8936981c7dc7fb50fc655c
parent 3981e152864fcc1dbbb564e1f4c0ae11a09639d2
parent b5b60fda1e462a849bc37dfbace2888191be82cc
author Linus Torvalds <torvalds@linux-foundation.org> 1261244922 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1261244922 -0800

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf session: Make events_stats u64 to avoid overflow on 32-bit arches
  hw-breakpoints: Fix hardware breakpoints -> perf events dependency
  perf events: Dont report side-band events on each cpu for per-task-per-cpu events
  perf events, x86/stacktrace: Fix performance/softlockup by providing a special frame pointer-only stack walker
  perf events, x86/stacktrace: Make stack walking optional
  perf events: Remove unused perf_counter.h header file
  perf probe: Check new event name
  kprobe-tracer: Check new event/group name
  perf probe: Check whether debugfs path is correct
  perf probe: Fix libdwarf include path for Debian