From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Apr 2011 17:56:02 +0000 (-0700)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: upstream/snapshot3+hdmi~10606
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96ad9999185363a1520434bdc6a775bbb27621f1;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.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, x86: Fix AMD family 15h FPU event constraints
  perf, x86: Fix pre-defined cache-misses event for AMD family 15h cpus
  perf evsel: Fix use of inherit
  perf hists browser: Fix seg fault when annotate null symbol
---

96ad9999185363a1520434bdc6a775bbb27621f1