Merge branches 'for-33/i2c/eg20t' and 'for-33/i2c/omap' into for-linus/i2c-33
authorBen Dooks <ben-linux@fluff.org>
Tue, 17 Jan 2012 23:30:41 +0000 (23:30 +0000)
committerBen Dooks <ben-linux@fluff.org>
Tue, 17 Jan 2012 23:30:41 +0000 (23:30 +0000)

Trivial merge