Merge branch 'for-2637/i2c/i2c-nomadik' into next-i2c
authorBen Dooks <ben-linux@fluff.org>
Thu, 28 Oct 2010 09:07:08 +0000 (10:07 +0100)
committerBen Dooks <ben-linux@fluff.org>
Thu, 28 Oct 2010 09:07:08 +0000 (10:07 +0100)

Trivial merge