From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Aug 2012 17:34:21 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.12-rc1~2520
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f78602ab7cbc902559406d2e8e21517056708295;p=kernel%2Fkernel-generic.git

Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 perf fixes from Ingo Molnar.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: disable PEBS on a guest entry.
  perf/x86: Add Intel Westmere-EX uncore support
  perf/x86: Fixes for Nehalem-EX uncore driver
  perf, x86: Fix uncore_types_exit section mismatch
---

f78602ab7cbc902559406d2e8e21517056708295