Merge branch 'for_3.3/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Fri, 9 Dec 2011 20:53:29 +0000 (12:53 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Dec 2011 20:53:29 +0000 (12:53 -0800)

Trivial merge