Merge branch 'for_3.0/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Mon, 13 Jun 2011 14:40:25 +0000 (07:40 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 13 Jun 2011 14:40:25 +0000 (07:40 -0700)

Trivial merge