Merge branches 'for-30-rc4/i2c-bfin', 'for-30-rc4/i2c-omap', 'for-30-rc4/i2c-s3c...
authorBen Dooks <ben-linux@fluff.org>
Mon, 27 Jun 2011 22:07:24 +0000 (23:07 +0100)
committerBen Dooks <ben-linux@fluff.org>
Mon, 27 Jun 2011 22:07:24 +0000 (23:07 +0100)

Trivial merge