Merge branch 'for_3.2/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Sat, 19 Nov 2011 00:01:00 +0000 (16:01 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 19 Nov 2011 00:01:00 +0000 (16:01 -0800)

Trivial merge