Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable

author Russell King <rmk+kernel@arm.linux.org.uk>

Fri, 15 Jul 2011 09:06:42 +0000 (10:06 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Fri, 15 Jul 2011 09:06:42 +0000 (10:06 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Fri, 15 Jul 2011 09:06:42 +0000 (10:06 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Fri, 15 Jul 2011 09:06:42 +0000 (10:06 +0100)
diff --cc arch/arm/kernel/perf_event.c
Simple merge
diff --cc arch/arm/kernel/setup.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Fri, 15 Jul 2011 09:06:42 +0000 (10:06 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Fri, 15 Jul 2011 09:06:42 +0000 (10:06 +0100)
		1	2
arch/arm/kernel/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history