Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorLothar Waßmann <LW@KARO-electronics.de>
Wed, 2 Jul 2014 12:13:45 +0000 (14:13 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 2 Jul 2014 12:13:45 +0000 (14:13 +0200)
1  2 
arch/arm/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/configs/imx_v6_v7_defconfig
arch/arm/mach-imx/clk-imx6sl.c
include/linux/regulator/consumer.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge