Merge branch 'pm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/khilman/linux...
authorTony Lindgren <tony@atomide.com>
Thu, 21 Jan 2010 02:20:47 +0000 (18:20 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 21 Jan 2010 02:20:47 +0000 (18:20 -0800)

Trivial merge