Merge branch 'hwmod_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 23 Sep 2010 18:05:25 +0000 (11:05 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 23 Sep 2010 18:05:25 +0000 (11:05 -0700)

Trivial merge