Merge branch 'for_3.2-rc/hwmod-fixes' of git://gitorious.org/omap-pm/linux into fixes
authorTony Lindgren <tony@atomide.com>
Fri, 18 Nov 2011 23:20:14 +0000 (15:20 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 18 Nov 2011 23:20:14 +0000 (15:20 -0800)

Trivial merge