Merge branch 'for_2.6.39/omap4_hwmod_data' of git://gitorious.org/omap-pm/linux into...
Tony Lindgren [Thu, 17 Feb 2011 17:48:24 +0000 (09:48 -0800)]

Trivial merge