Merge branch 'for_3.4/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 18:31:38 +0000 (11:31 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 18:31:38 +0000 (11:31 -0700)

Trivial merge