Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux...
commit93697a3cabd3605c434a9b915c0272ad800b3f97
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 20:48:37 +0000 (5 13:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Sep 2009 20:48:37 +0000 (5 13:48 -0700)
treedc26826f10979e02efbd2c6a87b326b770284b18
parent63995344721be45b3fb3b76488b1b0a8c95def26
parenta3df6f7d3090e611bcc774cd2cba45ae016d37e1
Merge branch 'perfcounters-fixes-for-linus' of git://git./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