From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 May 2011 10:13:46 +0000 (-0700)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=7f12b72bd8532cbbfb147470f0d902260cea36ce;p=linux-edison.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 evlist: Fix per thread mmap setup
  perf tools: Honour the cpu list parameter when also monitoring a thread list
  kprobes, x86: Disable irqs during optimized callback
---

7f12b72bd8532cbbfb147470f0d902260cea36ce