tree 911ddec19e97d06877f3f00ee90f51389e030549
parent 7dfb2d4069cc698da925327e8c2106852a0c77a2
parent 9d5f3714e4705a66b6be693f7202192f756f498e
author Linus Torvalds <torvalds@linux-foundation.org> 1282149133 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282149133 -0700

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 tools: Fix build on POSIX shells
  latencytop: Fix kconfig dependency warnings
  perf annotate tui: Fix exit and RIGHT keys handling
  tracing: Sanitize value returned from write(trace_marker, "...", len)
  tracing/events: Convert format output to seq_file
  tracing: Extend recordmcount to better support Blackfin mcount
  tracing: Fix ring_buffer_read_page reading out of page boundary
  tracing: Fix an unallocated memory access in function_graph