]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commit
Merge branch 'platform-ti-linux-3.14.y' into pm-ti-linux-3.14.y
authorDave Gerlach <d-gerlach@ti.com>
Fri, 29 May 2015 21:35:28 +0000 (16:35 -0500)
committerDave Gerlach <d-gerlach@ti.com>
Fri, 29 May 2015 21:35:28 +0000 (16:35 -0500)
commit536275b356cb1465d8521cff2cdca1d3c36119e3
treed75e5fe90a356d2f34a08e03425b6ff77818c87e
parent9c9de57b807eaee2db12b86385335bf0d7df1332
parente555469f52a19e030b5ae14d5109c59c187bb2df
Merge branch 'platform-ti-linux-3.14.y' into pm-ti-linux-3.14.y

Conflicts:
arch/arm/common/edma.c
arch/arm/mach-omap2/Makefile
drivers/regulator/palmas-regulator.c
include/dt-bindings/pinctrl/am43xx.h
include/linux/mfd/palmas.h

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
20 files changed:
arch/arm/boot/dts/am57xx-beagle-x15.dts
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/dra72-evm.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/common/edma.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.h
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
arch/arm/mach-omap2/timer.c
drivers/bus/omap_l3_noc.c
drivers/clk/ti/dpll.c
include/dt-bindings/pinctrl/am43xx.h
include/linux/clk/ti.h