Merge branches 'cache-l2x0', 'fixes', 'misc', 'mmci', 'vic' and 'warnings' into for...

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

Tue, 13 Nov 2012 13:27:01 +0000 (13:27 +0000)

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

Tue, 13 Nov 2012 13:27:01 +0000 (13:27 +0000)
author Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 13 Nov 2012 13:27:01 +0000 (13:27 +0000)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 13 Nov 2012 13:27:01 +0000 (13:27 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/smp.c
Simple merge
diff --cc arch/arm/kernel/smp_twd.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 13 Nov 2012 13:27:01 +0000 (13:27 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 13 Nov 2012 13:27:01 +0000 (13:27 +0000)
		1	2	3	4	5	6
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/kernel/smp.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/kernel/smp_twd.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history