tree dc26826f10979e02efbd2c6a87b326b770284b18
parent 63995344721be45b3fb3b76488b1b0a8c95def26
parent a3df6f7d3090e611bcc774cd2cba45ae016d37e1
author Linus Torvalds <torvalds@linux-foundation.org> 1252183717 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252183717 -0700

Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf_counter/powerpc: Fix cache event codes for POWER7
  perf_counter: Fix /0 bug in swcounters
  perf_counters: Increase paranoia level