Merge branch 'i2c'
authorTony Lindgren <tony@atomide.com>
Sat, 17 Dec 2011 00:56:56 +0000 (16:56 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 17 Dec 2011 00:56:56 +0000 (16:56 -0800)

Trivial merge