Merge branch 'cleanup-hwmod' into cleanup omap-cleanup-for-v3.6
authorTony Lindgren <tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000 (05:47 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000 (05:47 -0700)
Conflicts:
arch/arm/mach-omap2/dsp.c


Trivial merge