From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Feb 2011 18:18:48 +0000 (-0800)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.38-rc5~10
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1cecd791f2708b621e619cf4df4636c97c9497e5;p=linux-2.6-block.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:
  x86: Fix text_poke_smp_batch() deadlock
  perf tools: Fix thread_map event synthesizing in top and record
  watchdog, nmi: Lower the severity of error messages
  ARM: oprofile: Fix backtraces in timer mode
  oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends
---

1cecd791f2708b621e619cf4df4636c97c9497e5