tree 3f68ae3edce08546b0d22674488abff1c4c271e1
parent e126613e67873178f3c6f7c8674e70aa4327d8cd
parent 21e2ecfe19df8f28408b5a607fef8704f51fa7f8
author Ben Dooks <ben-linux@fluff.org> 1281483319 +0100
committer Ben Dooks <ben-linux@fluff.org> 1281483319 +0100

Merge branch 'for-2636/i2c/pxa' into next-i2c