From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Apr 2011 22:08:53 +0000 (-0700)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0~901
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40a963502cd44765a0e0d45ff3409051986b5a39;p=platform%2Fkernel%2Flinux-amlogic.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, nmi: Move LVT un-masking into irq handlers
  perf events, x86: Work around the Nehalem AAJ80 erratum
  perf, x86: Fix BTS condition
  ftrace: Build without frame pointers on Microblaze
---

40a963502cd44765a0e0d45ff3409051986b5a39