tree 0fb18544cbc4d653375ed15ec5339534e58d69d7
parent 428dcc19374c9ebcf8fee057057c9023174c1b2a
parent 6d779a4c3f97023fe329ef33aba25c8aaadf281b
author Ben Dooks <ben-linux@fluff.org> 1294871132 +0000
committer Ben Dooks <ben-linux@fluff.org> 1294871132 +0000

Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638