Merge branch 'pm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux...
authorTony Lindgren <tony@atomide.com>
Fri, 14 May 2010 17:04:06 +0000 (10:04 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 14 May 2010 17:04:06 +0000 (10:04 -0700)

Trivial merge