Merge branch 'pm-fixes-32' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Tue, 6 Oct 2009 15:32:28 +0000 (08:32 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Oct 2009 15:32:28 +0000 (08:32 -0700)

Trivial merge