Merge branch 'for_3.4/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2012 21:32:47 +0000 (13:32 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Mar 2012 21:32:47 +0000 (13:32 -0800)

Trivial merge