Merge branch 'next/cleanup' into for-next

author Olof Johansson <olof@lixom.net>

Thu, 29 May 2014 19:42:46 +0000 (12:42 -0700)

committer Olof Johansson <olof@lixom.net>

Thu, 29 May 2014 19:42:46 +0000 (12:42 -0700)
author Olof Johansson <olof@lixom.net>
Thu, 29 May 2014 19:42:46 +0000 (12:42 -0700)
committer Olof Johansson <olof@lixom.net>
Thu, 29 May 2014 19:42:46 +0000 (12:42 -0700)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-bcm/Kconfig
Simple merge
diff --cc arch/arm/mach-imx/Kconfig
Simple merge
diff --cc arch/arm/mach-mvebu/Kconfig
Simple merge
diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge
author	Olof Johansson <olof@lixom.net>
	Thu, 29 May 2014 19:42:46 +0000 (12:42 -0700)
committer	Olof Johansson <olof@lixom.net>
	Thu, 29 May 2014 19:42:46 +0000 (12:42 -0700)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-bcm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mvebu/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-shmobile/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history