tree 2667a923fedcbf8324dde93f0acc17879fa7d862
parent ff49d74ad383f54041378144ca1a229ee9aeaa59
parent f287d332ce835f77a4f5077d2c0ef1e3f9ea42d2
author Linus Torvalds <torvalds@linux-foundation.org> 1278300053 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1278300053 -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: Fix incorrect branches event on AMD CPUs
  perf tools: Fix find tids routine by excluding "." and ".."
  x86: Send a SIGTRAP for user icebp traps