Merge branch 'omap-for-v4.14/fixes' into omap-for-v4.15/fixes-v2
authorTony Lindgren <tony@atomide.com>
Tue, 28 Nov 2017 16:22:57 +0000 (08:22 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 28 Nov 2017 16:22:57 +0000 (08:22 -0800)
commit124dcf7960d6832ca72c1cad8a6d87fef756b34e
tree5620f390fcc61913d188d23eb0e09ae5a24dec3d
parent2db57789e6612ce0cf2fcbb577a1c8307b708566
parent6301d58477bc11116c78c9542871f27ae374278d
Merge branch 'omap-for-v4.14/fixes' into omap-for-v4.15/fixes-v2
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/prcm-common.h