Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

author Lothar Waßmann <LW@KARO-electronics.de>

Wed, 2 Jul 2014 12:13:45 +0000 (14:13 +0200)

committer Lothar Waßmann <LW@KARO-electronics.de>

Wed, 2 Jul 2014 12:13:45 +0000 (14:13 +0200)
author Lothar Waßmann <LW@KARO-electronics.de>
Wed, 2 Jul 2014 12:13:45 +0000 (14:13 +0200)
committer Lothar Waßmann <LW@KARO-electronics.de>
Wed, 2 Jul 2014 12:13:45 +0000 (14:13 +0200)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/boot/dts/Makefile
Simple merge
diff --cc arch/arm/configs/imx_v6_v7_defconfig
Simple merge
diff --cc arch/arm/mach-imx/clk-imx6sl.c
Simple merge
diff --cc include/linux/regulator/consumer.h
Simple merge
author	Lothar Waßmann <LW@KARO-electronics.de>
	Wed, 2 Jul 2014 12:13:45 +0000 (14:13 +0200)
committer	Lothar Waßmann <LW@KARO-electronics.de>
	Wed, 2 Jul 2014 12:13:45 +0000 (14:13 +0200)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/imx_v6_v7_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clk-imx6sl.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/regulator/consumer.h	patch \|	diff1 \|	diff2 \|	blob \| history