Merge branch 'omap-for-v4.13/clkctrl' into omap-for-v4.13/soc-v4
authorTony Lindgren <tony@atomide.com>
Mon, 12 Jun 2017 10:27:30 +0000 (03:27 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 12 Jun 2017 10:27:30 +0000 (03:27 -0700)
commit67d00470accf5c58abbb23a44c867c5f15437976
tree4141a408b08ec38c6d3cf0295641ce3e8a63182b
parent018b732458ac39c4858d9840c0e32310bc0930dd
parent70f05be3213393f20f01e4d59625df7ee49fe32f
Merge branch 'omap-for-v4.13/clkctrl' into omap-for-v4.13/soc-v4
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/prm3xxx.c
arch/arm/mach-omap2/prm44xx.c
arch/arm/mach-omap2/prm_common.c
arch/arm/mach-omap2/timer.c