From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Sep 2009 20:48:37 +0000 (-0700)
Subject: Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v2.6.31-rc9~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93697a3cabd3605c434a9b915c0272ad800b3f97;p=thirdparty%2Fkernel%2Fstable.git

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
---

93697a3cabd3605c434a9b915c0272ad800b3f97