Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and 'for...
authorBen Dooks <ben-linux@fluff.org>
Mon, 21 Mar 2011 22:57:25 +0000 (22:57 +0000)
committerBen Dooks <ben-linux@fluff.org>
Mon, 21 Mar 2011 22:57:25 +0000 (22:57 +0000)

Trivial merge