Merge branch 'pm-hwmod-i2c' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilm...
authorTony Lindgren <tony@atomide.com>
Tue, 16 Nov 2010 21:40:37 +0000 (13:40 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 16 Nov 2010 21:40:37 +0000 (13:40 -0800)

Trivial merge