Skip to content
Commit 472fd540 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'cleanup-hwmod' into cleanup 

Conflicts:
	arch/arm/mach-omap2/dsp.c
parents 5f612967 19f3a98d
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