Merge branch 'pm-hwmod-i2c' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilm...
authorTony Lindgren <tony@atomide.com>
Tue, 19 Oct 2010 22:17:33 +0000 (15:17 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 19 Oct 2010 22:17:33 +0000 (15:17 -0700)

Trivial merge