Merge branch 'dm814x-soc' into omap-for-v4.3/soc omap-for-v4.3/soc-signed
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)
Update dm814x changes for sparse fixes to make data structures
static.

Conflicts:
arch/arm/mach-omap2/omap_hwmod_81xx_data.c

1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge