Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 17:20:40 +0000 (10:20 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 17:20:40 +0000 (10:20 -0700)

Trivial merge