Merge branch 'jp_hwmod_pm_dev_lat_devel_3.3' of git://git.pwsan.com/linux-2.6 into...
authorTony Lindgren <tony@atomide.com>
Thu, 22 Dec 2011 18:11:48 +0000 (10:11 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 22 Dec 2011 18:11:48 +0000 (10:11 -0800)

Trivial merge