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)
1  2 
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/prcm-common.h

Simple merge