Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next

author Russell King <[email protected]>

Tue, 12 Nov 2013 10:59:08 +0000 (10:59 +0000)

committer Russell King <[email protected]>

Tue, 12 Nov 2013 10:59:08 +0000 (10:59 +0000)
author Russell King <[email protected]>
Tue, 12 Nov 2013 10:59:08 +0000 (10:59 +0000)
committer Russell King <[email protected]>
Tue, 12 Nov 2013 10:59:08 +0000 (10:59 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/entry-armv.S
Simple merge
diff --cc arch/arm/kernel/signal.c
Simple merge
diff --cc arch/arm/mach-highbank/Kconfig
Simple merge
diff --cc arch/arm/mm/dma-mapping.c
Simple merge
author	Russell King <[email protected]>
	Tue, 12 Nov 2013 10:59:08 +0000 (10:59 +0000)
committer	Russell King <[email protected]>
	Tue, 12 Nov 2013 10:59:08 +0000 (10:59 +0000)
		1	2	3	4
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/kernel/entry-armv.S	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/kernel/signal.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mach-highbank/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/arm/mm/dma-mapping.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history