Merge branch 'pm-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Wed, 24 Feb 2010 03:22:48 +0000 (19:22 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 24 Feb 2010 03:22:48 +0000 (19:22 -0800)

Trivial merge