Skip to content
Commit 24da741c authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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
parents 97d9a3d0 0f3ccb24
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment