Merge branch 'pm-upstream/pm-off' of ssh://master.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Wed, 11 Nov 2009 23:20:53 +0000 (15:20 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 11 Nov 2009 23:20:53 +0000 (15:20 -0800)

Trivial merge