Merge branch 'dm814x-soc' into omap-for-v4.3/soc
authorTony Lindgren <tony@atomide.com>
Fri, 24 Jul 2015 04:59:18 +0000 (21:59 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Jul 2015 04:59:18 +0000 (21:59 -0700)
commit24da741c678f865de3182194604dbddcc7fc7f3c
tree0322f37f8e9e4e945acc100a0d1821db268fe624
parent97d9a3d0967f711e271ef950f1745307720c95d5
parent0f3ccb24c0347cd80160810df79bfa233749074e
Merge branch 'dm814x-soc' into omap-for-v4.3/soc

Update dm814x changes for sparse fixes to make data structures
static.

Conflicts:
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.h
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
arch/arm/mach-omap2/prcm-common.h