tree a1a329f07ab904ccfeb5a58aa528ec28872b1f13
parent f061d83a2b29f08b41c494335b7d23a432cb5a2d
parent a003236c32706f3c1f74d4e3b98c58cf0d9a9d8f
author Linus Torvalds <torvalds@linux-foundation.org> 1255559123 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255559123 -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 events: Update MAINTAINERS entry file patterns
  perf tools: Remove static debugfs path from parse-events
  perf tools: Fix the NO_64BIT build on pure 64-bit systems
  perf tools: Fix const char type propagation