Merge branch 'davinci-i2c' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorBen Dooks <ben-linux@fluff.org>
Mon, 9 Aug 2010 13:30:24 +0000 (14:30 +0100)
committerBen Dooks <ben-linux@fluff.org>
Mon, 9 Aug 2010 13:30:24 +0000 (14:30 +0100)

Trivial merge