Merge branches 'fixes' and 'misc' into for-next

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

Tue, 24 Jun 2014 21:54:40 +0000 (22:54 +0100)

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

Tue, 24 Jun 2014 21:54:40 +0000 (22:54 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 Jun 2014 21:54:40 +0000 (22:54 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 Jun 2014 21:54:40 +0000 (22:54 +0100)
diff --cc arch/arm/mach-imx/Kconfig
Simple merge
diff --cc arch/arm/mach-omap2/Kconfig
Simple merge
diff --cc arch/arm/mach-sti/Kconfig
Simple merge
diff --cc arch/arm/mach-ux500/Kconfig
Simple merge
diff --cc arch/arm/mach-vexpress/Kconfig
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 24 Jun 2014 21:54:40 +0000 (22:54 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 24 Jun 2014 21:54:40 +0000 (22:54 +0100)
		1	2
arch/arm/mach-imx/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sti/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history