tree c60752bc177c3297e28e62f759ddd5816fa52e19
parent 37822188ef7bb41ae47b84ae283e6ac93cdafb9c
parent 8d330919927ea31fa083b5a80084dc991da813a0
author Linus Torvalds <torvalds@linux-foundation.org> 1282758607 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282758607 -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, x86, Pentium4: Clear the P4_CCCR_FORCE_OVF flag
  tracing/trace_stack: Fix stack trace on ppc64