Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12
authorBen Dooks <ben-linux@fluff.org>
Sun, 20 Mar 2011 22:14:04 +0000 (22:14 +0000)
committerBen Dooks <ben-linux@fluff.org>
Sun, 20 Mar 2011 22:14:04 +0000 (22:14 +0000)

Trivial merge