Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 02:54:14 +0000 (18:54 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 11 Mar 2011 02:54:14 +0000 (18:54 -0800)

Trivial merge