Merge branch 'cleanup-hwmod' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 27 Jun 2012 15:23:25 +0000 (08:23 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 27 Jun 2012 15:23:25 +0000 (08:23 -0700)
Conflicts:
arch/arm/mach-omap2/dsp.c


Trivial merge