From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Jan 2011 16:04:30 +0000 (-0800)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~20979
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c6fa63c659b3dd121f21afe7529f505505e79b23;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'perf-fixes-for-linus' of git://git./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
---

c6fa63c659b3dd121f21afe7529f505505e79b23