www.infradead.org Git - users/hch/configfs.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 15 Feb 2011 18:18:48 +0000 (10:18 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Tue, 15 Feb 2011 18:18:48 +0000 (10:18 -0800)

* '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

		1	2
arch/arm/oprofile/common.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge