Merge branch 'for_3.1/pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Wed, 10 Aug 2011 10:36:42 +0000 (03:36 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Aug 2011 10:36:42 +0000 (03:36 -0700)

Trivial merge