Merge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

Sat, 4 Feb 2012 10:32:18 +0000 (10:32 +0000)

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

Sat, 4 Feb 2012 10:32:18 +0000 (10:32 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Sat, 4 Feb 2012 10:32:18 +0000 (10:32 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Sat, 4 Feb 2012 10:32:18 +0000 (10:32 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/time.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Sat, 4 Feb 2012 10:32:18 +0000 (10:32 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sat, 4 Feb 2012 10:32:18 +0000 (10:32 +0000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/time.c	patch \|	diff1 \|	diff2 \|	blob \| history