Merge branch 'cleanup-hwmod' into cleanup

Conflicts:
	arch/arm/mach-omap2/dsp.c
This commit is contained in:
Tony Lindgren 2012-06-28 05:47:01 -07:00
commit 472fd54015
22 changed files with 409 additions and 187 deletions