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

Trivial merge