Merge branch 'pm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux...
authorTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:11:44 +0000 (11:11 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:11:44 +0000 (11:11 -0700)

Trivial merge