tree aee05a39134e299a6186ca455cc5666f8d565c23
parent aa62f85d0c65712c24b4892e9eab929d5176cee2
parent f868fc355ad852b476950c2fe4f5bae7480e8f04
author Ben Dooks <ben-linux@fluff.org> 1288256828 +0100
committer Ben Dooks <ben-linux@fluff.org> 1288256828 +0100

Merge branch 'for-2637/i2c/i2c-nomadik' into next-i2c