Merge branch 'next-i2c-omap' into next-i2c
authorBen Dooks <ben-linux@fluff.org>
Sun, 7 Mar 2010 22:29:21 +0000 (22:29 +0000)
committerBen Dooks <ben-linux@fluff.org>
Sun, 7 Mar 2010 22:29:21 +0000 (22:29 +0000)

Trivial merge