Merge branch 'pm-hwmod-i2c' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilm...
authorTony Lindgren <tony@atomide.com>
Thu, 25 Nov 2010 01:14:12 +0000 (17:14 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 25 Nov 2010 01:14:12 +0000 (17:14 -0800)

Trivial merge