Merge branches 'arch-timers', 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator...

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

Mon, 17 Sep 2012 22:21:13 +0000 (23:21 +0100)

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

Mon, 17 Sep 2012 22:21:13 +0000 (23:21 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 Sep 2012 22:21:13 +0000 (23:21 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 Sep 2012 22:21:13 +0000 (23:21 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
diff --cc arch/arm/kernel/sched_clock.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 17 Sep 2012 22:21:13 +0000 (23:21 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 17 Sep 2012 22:21:13 +0000 (23:21 +0100)
		1	2	3	4	5	6	7	8
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
arch/arm/kernel/sched_clock.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history