commit | c6fa63c659b3dd121f21afe7529f505505e79b23 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 18 08:04:30 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 18 08:04:30 2011 -0800 |
tree | 1ad782e1fa623416efce7a6525248b54458d5f7c | |
parent | 34c682adb30e9602e92f044056c142f69b4a6cfe [diff] | |
parent | ad7f4e3f7b966ac09c8f98dbc5024813a1685775 [diff] |
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