tree 1ad782e1fa623416efce7a6525248b54458d5f7c
parent 34c682adb30e9602e92f044056c142f69b4a6cfe
parent ad7f4e3f7b966ac09c8f98dbc5024813a1685775
author Linus Torvalds <torvalds@linux-foundation.org> 1295366670 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295366670 -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 tools: Fix tracepoint id to string perf.data header table
  perf tools: Fix handling of wildcards in tracepoint event selectors
  powerpc: perf: Fix frequency calculation for overflowing counters