Merge branch 'for_2.6.39/pm-integration' of ssh://master.kernel.org/pub/scm/linux...
authorTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 17:39:58 +0000 (09:39 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 17:39:58 +0000 (09:39 -0800)

Trivial merge