Skip to content
GitLab
Commit a08572ae authored by Paul Walmsley's avatar Paul Walmsley
Browse files

Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2.6.39-20110310-024 

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
parents 2d403fe0 c0718df4
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
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