Merge branch 'omap-for-v4.14/fixes' into omap-for-v4.15/fixes-v2

author Tony Lindgren <[email protected]>

Tue, 28 Nov 2017 16:22:57 +0000 (08:22 -0800)

committer Tony Lindgren <[email protected]>

Tue, 28 Nov 2017 16:22:57 +0000 (08:22 -0800)
author Tony Lindgren <[email protected]>
Tue, 28 Nov 2017 16:22:57 +0000 (08:22 -0800)
committer Tony Lindgren <[email protected]>
Tue, 28 Nov 2017 16:22:57 +0000 (08:22 -0800)
diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge
diff --cc arch/arm/mach-omap2/prcm-common.h
Simple merge
author	Tony Lindgren <[email protected]>
	Tue, 28 Nov 2017 16:22:57 +0000 (08:22 -0800)
committer	Tony Lindgren <[email protected]>
	Tue, 28 Nov 2017 16:22:57 +0000 (08:22 -0800)
		1	2
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/prcm-common.h	patch \|	diff1 \|	diff2 \|	blob \| history