Merge branch 'for_2.6.39/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Wed, 20 Apr 2011 15:44:30 +0000 (08:44 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 20 Apr 2011 15:44:30 +0000 (08:44 -0700)

Trivial merge