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

Trivial merge