Merge branch 'for_3.3/pm/omap4-mpuss' of git://git.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Thu, 8 Dec 2011 21:22:57 +0000 (13:22 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 8 Dec 2011 21:22:57 +0000 (13:22 -0800)

Trivial merge