Merge branch 'for-2636/i2c/pxa' into next-i2c
authorBen Dooks <ben-linux@fluff.org>
Tue, 10 Aug 2010 23:35:19 +0000 (00:35 +0100)
committerBen Dooks <ben-linux@fluff.org>
Tue, 10 Aug 2010 23:35:19 +0000 (00:35 +0100)

Trivial merge